Merge pull request #1523 from prometheus/cleanup

Remove unused code leftovers

promql/engine_test.go

@@ -8,10 +8,6 @@ import (
 	"golang.org/x/net/context"
 )
 
-var noop = testStmt(func(context.Context) error {
-	return nil
-})
-
 func TestQueryConcurrency(t *testing.T) {
 	engine := NewEngine(nil, nil)
 	defer engine.Stop()

promql/parse.go

@@ -925,8 +925,6 @@ func (p *parser) offset() time.Duration {
 //		[<metric_identifier>] <label_matchers>
 //
 func (p *parser) vectorSelector(name string) *VectorSelector {
-	const ctx = "metric selector"
-
 	var matchers metric.LabelMatchers
 	// Parse label matching if any.
 	if t := p.peek(); t.typ == itemLeftBrace {

retrieval/discovery/dns.go

@@ -36,7 +36,6 @@ const (
 
 	// Constants for instrumentation.
 	namespace = "prometheus"
-	interval  = "interval"
 )
 
 var (

retrieval/discovery/nerve.go

@@ -28,8 +28,6 @@ import (
 )
 
 const (
-	nerveNodePrefix = "member_"
-
 	nerveLabelPrefix         = model.MetaLabelPrefix + "nerve_"
 	nervePathLabel           = nerveLabelPrefix + "path"
 	nerveEndpointLabelPrefix = nerveLabelPrefix + "endpoint"

retrieval/discovery/serverset.go

@@ -30,8 +30,6 @@ import (
 )
 
 const (
-	serversetNodePrefix = "member_"
-
 	serversetLabelPrefix         = model.MetaLabelPrefix + "serverset_"
 	serversetStatusLabel         = serversetLabelPrefix + "status"
 	serversetPathLabel           = serversetLabelPrefix + "path"

retrieval/scrape.go

@@ -14,7 +14,6 @@
 package retrieval
 
 import (
-	"errors"
 	"fmt"
 	"io"
 	"net/http"
@@ -37,9 +36,6 @@ const (
 	scrapeHealthMetricName   = "up"
 	scrapeDurationMetricName = "scrape_duration_seconds"
 
-	// Capacity of the channel to buffer samples during ingestion.
-	ingestedSamplesCap = 256
-
 	// Constants for instrumentation.
 	namespace = "prometheus"
 	interval  = "interval"
@@ -47,8 +43,6 @@ const (
 )
 
 var (
-	errSkippedScrape = errors.New("scrape skipped due to throttled ingestion")
-
 	targetIntervalLength = prometheus.NewSummaryVec(
 		prometheus.SummaryOpts{
 			Namespace:  namespace,

storage/remote/opentsdb/client.go

@@ -21,7 +21,6 @@ import (
 	"math"
 	"net/http"
 	"net/url"
-	"regexp"
 	"time"
 
 	"github.com/prometheus/common/log"
@@ -36,10 +35,6 @@ const (
 	contentTypeJSON = "application/json"
 )
 
-var (
-	illegalCharsRE = regexp.MustCompile(`[^a-zA-Z0-9_\-./]`)
-)
-
 // Client allows sending batches of Prometheus samples to OpenTSDB.
 type Client struct {
 	url        string