From 75bd348135019c6bf5bee4350a339964e62f2d8a Mon Sep 17 00:00:00 2001
From: Simon Pasquier <spasquie@redhat.com>
Date: Wed, 29 Aug 2018 09:25:46 +0200
Subject: [PATCH] web: clean up api/v2 (#4554)

Signed-off-by: Simon Pasquier <spasquie@redhat.com>
---
 web/api/v2/api.go | 25 ++++---------------------
 web/web.go        |  9 ---------
 2 files changed, 4 insertions(+), 30 deletions(-)

diff --git a/web/api/v2/api.go b/web/api/v2/api.go
index d6b6c5e69..c1fe1de4a 100644
--- a/web/api/v2/api.go
+++ b/web/api/v2/api.go
@@ -19,7 +19,6 @@ import (
 	"math"
 	"math/rand"
 	"net/http"
-	"net/url"
 	"os"
 	"path/filepath"
 	"time"
@@ -39,38 +38,22 @@ import (
 	"github.com/prometheus/prometheus/pkg/labels"
 	"github.com/prometheus/prometheus/pkg/timestamp"
 	pb "github.com/prometheus/prometheus/prompb"
-	"github.com/prometheus/prometheus/promql"
-	"github.com/prometheus/prometheus/scrape"
-	"github.com/prometheus/prometheus/storage"
 )
 
 // API encapsulates all API services.
 type API struct {
-	enableAdmin   bool
-	now           func() time.Time
-	db            func() *tsdb.DB
-	q             func(ctx context.Context, mint, maxt int64) (storage.Querier, error)
-	targets       func() []*scrape.Target
-	alertmanagers func() []*url.URL
+	enableAdmin bool
+	db          func() *tsdb.DB
 }
 
 // New returns a new API object.
 func New(
-	now func() time.Time,
 	db func() *tsdb.DB,
-	qe *promql.Engine,
-	q func(ctx context.Context, mint, maxt int64) (storage.Querier, error),
-	targets func() []*scrape.Target,
-	alertmanagers func() []*url.URL,
 	enableAdmin bool,
 ) *API {
 	return &API{
-		now:           now,
-		db:            db,
-		q:             q,
-		targets:       targets,
-		alertmanagers: alertmanagers,
-		enableAdmin:   enableAdmin,
+		db:          db,
+		enableAdmin: enableAdmin,
 	}
 }
 
diff --git a/web/web.go b/web/web.go
index e49d4bb2a..a278092a4 100644
--- a/web/web.go
+++ b/web/web.go
@@ -412,16 +412,7 @@ func (h *Handler) Run(ctx context.Context) error {
 		grpcSrv = grpc.NewServer()
 	)
 	av2 := api_v2.New(
-		time.Now,
 		h.options.TSDB,
-		h.options.QueryEngine,
-		h.options.Storage.Querier,
-		func() []*scrape.Target {
-			return h.options.ScrapeManager.TargetsActive()
-		},
-		func() []*url.URL {
-			return h.options.Notifier.Alertmanagers()
-		},
 		h.options.EnableAdminAPI,
 	)
 	av2.RegisterGRPC(grpcSrv)