Update promql.NewEngine and v1.NewAPI

Author: aaron7

cmd/lite/main.go

@@ -4,6 +4,7 @@ import (
 	"flag"
 	"net/http"
 	"os"
+	"time"
 
 	"github.com/go-kit/kit/log/level"
 	"github.com/opentracing-contrib/go-stdlib/nethttp"
@@ -147,13 +148,16 @@ func main() {
 	sampleQueryable := querier.NewQueryable(dist, chunkStore, false)
 	metadataQueryable := querier.NewQueryable(dist, chunkStore, true)
 
-	engine := promql.NewEngine(sampleQueryable, nil)
+	maxConcurrent := 20
+	timeout := 2 * time.Minute
+	engine := promql.NewEngine(util.Logger, nil, maxConcurrent, timeout)
 	api := v1.NewAPI(
 		engine,
 		metadataQueryable,
 		querier.DummyTargetRetriever{},
 		querier.DummyAlertmanagerRetriever{},
 		func() config.Config { return config.Config{} },
+		map[string]string{}, // TODO: include configuration flags
 		func(f http.HandlerFunc) http.HandlerFunc { return f },
 		func() *tsdb.DB { return nil }, // Only needed for admin APIs.
 		false, // Disable admin APIs.

cmd/querier/main.go

@@ -4,6 +4,7 @@ import (
 	"flag"
 	"net/http"
 	"os"
+	"time"
 
 	"google.golang.org/grpc"
 
@@ -91,13 +92,16 @@ func main() {
 	sampleQueryable := querier.NewQueryable(dist, chunkStore, false)
 	metadataQueryable := querier.NewQueryable(dist, chunkStore, true)
 
-	engine := promql.NewEngine(sampleQueryable, nil)
+	maxConcurrent := 20
+	timeout := 2 * time.Minute
+	engine := promql.NewEngine(util.Logger, nil, maxConcurrent, timeout)
 	api := v1.NewAPI(
 		engine,
 		metadataQueryable,
 		querier.DummyTargetRetriever{},
 		querier.DummyAlertmanagerRetriever{},
 		func() config.Config { return config.Config{} },
+		map[string]string{}, // TODO: include configuration flags
 		func(f http.HandlerFunc) http.HandlerFunc { return f },
 		func() *tsdb.DB { return nil }, // Only needed for admin APIs.
 		false, // Disable admin APIs.

pkg/querier/dummy.go

@@ -12,8 +12,14 @@ type DummyTargetRetriever struct{}
 // Targets implements TargetRetriever.
 func (r DummyTargetRetriever) Targets() []*scrape.Target { return nil }
 
+// DroppedTargets implements TargetRetriever.
+func (r DummyTargetRetriever) DroppedTargets() []*scrape.Target { return nil }
+
 // DummyAlertmanagerRetriever implements AlertmanagerRetriever.
 type DummyAlertmanagerRetriever struct{}
 
 // Alertmanagers implements AlertmanagerRetriever.
 func (r DummyAlertmanagerRetriever) Alertmanagers() []*url.URL { return nil }
+
+// DroppedAlertmanagers implements AlertmanagerRetriever.
+func (r DummyAlertmanagerRetriever) DroppedAlertmanagers() []*url.URL { return nil }