Merge pull request #1613 from grafana/remove-promql

Remove promql

Gopkg.toml

@@ -65,10 +65,6 @@ unused-packages = true
   name = "github.com/gocql/gocql"
   revision = "1982a06ad6b987c24beec15336019914d71b2e31"
 
-[[constraint]]
-  name = "github.com/golang/snappy"
-  branch = "master"
-
 [[constraint]]
   name = "github.com/hailocab/go-hostpool"
   branch = "master"
@@ -138,11 +134,6 @@ unused-packages = true
   name = "gopkg.in/macaron.v1"
   version = "1.1.8"
 
-[[constraint]]
-  name = "github.com/prometheus/prometheus"
-  source = "https://github.com/Dieterbe/prometheus.git"
-  branch = "v2.1.0-tom-fix-testing-flags"
-
 [[constraint]]
   name = "github.com/prometheus/procfs"
   revision = "75f2d6163c7a100bed6e971044ea3de30ee3a678"

README.md

@@ -22,12 +22,11 @@ Most notably, the heavily compressed chunks dramatically lower cpu, memory and s
 * Writeback RAM cache, serving most data out of memory.
 * Graphite is a first class citizen. As of graphite-1.0.1, metrictank can be used as a graphite CLUSTER_SERVER.
 * Can also act as a Graphite server itself, though the functions processing library is only partially implemented, metrictank proxies requests to Graphite if it can't handle the required processing (for those requests it will degrade to just being the backend storage)
-* Can also be used with Prometheus (but the experience won't be as good as something built just for prometheus, which we're also working on)
 * Accurate, flexible rollups by storing min/max/sum/count (which also gives us average).
 So we can do consolidation (combined runtime+archived) accurately and correctly,
 [unlike most other graphite backends like whisper](https://grafana.com/blog/2016/03/03/25-graphite-grafana-and-statsd-gotchas/#runtime.consolidation)
 * Flexible tenancy: can be used as single tenant or multi tenant. Selected data can be shared across all tenants.
-* Input options: carbon, metrics2.0, kafka, Prometheus (soon: json or msgpack over http)
+* Input options: carbon, metrics2.0, kafka (soon: json or msgpack over http)
 * Guards against excessive data requests
 * Data backfill/import from whisper
 

api/api.go

@@ -7,8 +7,6 @@ import (
 	"strings"
 	"time"
 
-	"github.com/prometheus/prometheus/promql"
-
 	_ "net/http/pprof"
 
 	"github.com/grafana/metrictank/idx"
@@ -43,7 +41,6 @@ type Server struct {
 	MetricIndex     idx.MetricIndex
 	MemoryStore     mdata.Metrics
 	BackendStore    mdata.Store
-	PromQueryEngine *promql.Engine
 	Cache           cache.Cache
 	shutdown        chan struct{}
 	Tracer          opentracing.Tracer
@@ -68,10 +65,6 @@ func (s *Server) BindTracer(tracer opentracing.Tracer) {
 	s.Tracer = tracer
 }
 
-func (s *Server) BindPromQueryEngine() {
-	s.PromQueryEngine = promql.NewEngine(s, nil)
-}
-
 type PrioritySetter interface {
 	ExplainPriority() interface{}
 }