revendors cortex & loki + compatibility fixes (#189)

Author: owen-d

go.mod

@@ -8,12 +8,12 @@ require (
 	github.com/alecthomas/chroma v0.7.0
 	github.com/alecthomas/repr v0.0.0-20181024024818-d37bc2a10ba1 // indirect
 	github.com/alecthomas/units v0.0.0-20210208195552-ff826a37aa15
-	github.com/cortexproject/cortex v1.7.1-0.20210310163109-5d23b16190f6
+	github.com/cortexproject/cortex v1.9.1-0.20210603172355-5e508061891a
 	github.com/dlclark/regexp2 v1.2.0 // indirect
 	github.com/go-kit/kit v0.10.0
 	github.com/gocql/gocql v0.0.0-20200526081602-cd04bd7f22a7
 	github.com/gogo/protobuf v1.3.2
-	github.com/golang/snappy v0.0.3-0.20201103224600-674baa8c7fc3
+	github.com/golang/snappy v0.0.3
 	github.com/gonum/blas v0.0.0-20181208220705-f22b278b28ac // indirect
 	github.com/gonum/floats v0.0.0-20181209220543-c233463c7e82 // indirect
 	github.com/gonum/integrate v0.0.0-20181209220457-a422b5c0fdf2 // indirect
@@ -24,23 +24,23 @@ require (
 	github.com/google/go-github/v32 v32.1.0
 	github.com/gorilla/mux v1.7.3
 	github.com/grafana-tools/sdk v0.0.0-20210310213032-c3f3511b3e9b
-	github.com/grafana/loki v1.6.2-0.20210310125813-306cc724380c
+	github.com/grafana/loki v1.6.2-0.20210604065612-c3af249fe0f7
 	github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db
 	github.com/oklog/ulid v1.3.1
 	github.com/opentracing-contrib/go-stdlib v1.0.0
 	github.com/opentracing/opentracing-go v1.2.0
 	github.com/pkg/errors v0.9.1
-	github.com/prometheus/alertmanager v0.21.1-0.20210310093010-0f9cab6991e6
-	github.com/prometheus/client_golang v1.9.0
-	github.com/prometheus/common v0.18.0
-	github.com/prometheus/prometheus v1.8.2-0.20210215121130-6f488061dfb4
+	github.com/prometheus/alertmanager v0.22.1-0.20210603124511-8b584eb2265e
+	github.com/prometheus/client_golang v1.10.0
+	github.com/prometheus/common v0.26.1-0.20210603143733-6ef301f414bf
+	github.com/prometheus/prometheus v1.8.2-0.20210510213326-e313ffa8abf6
 	github.com/sirupsen/logrus v1.7.0
 	github.com/stretchr/testify v1.7.0
-	github.com/thanos-io/thanos v0.13.1-0.20210226164558-03dace0a1aa1
-	github.com/weaveworks/common v0.0.0-20210112142934-23c8d7fa6120
+	github.com/thanos-io/thanos v0.19.1-0.20210427154226-d5bd651319d2
+	github.com/weaveworks/common v0.0.0-20210419092856-009d1eebd624
 	go.uber.org/atomic v1.7.0
-	golang.org/x/sync v0.0.0-20201207232520-09787c993a3a
-	google.golang.org/api v0.39.0
+	golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
+	google.golang.org/api v0.46.0
 	gopkg.in/alecthomas/kingpin.v2 v2.2.6
 	gopkg.in/yaml.v2 v2.4.0
 	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b
@@ -66,8 +66,5 @@ replace github.com/gocql/gocql => github.com/grafana/gocql v0.0.0-20200605141915
 replace github.com/bradfitz/gomemcache => github.com/themihai/gomemcache v0.0.0-20180902122335-24332e2d58ab
 
 // Required for Alertmanager
-replace github.com/go-openapi/errors => github.com/go-openapi/errors v0.19.4
-
-replace github.com/go-openapi/validate => github.com/go-openapi/validate v0.19.8
 
 replace github.com/hashicorp/consul => github.com/hashicorp/consul v1.8.1

go.sum

@@ -118,7 +118,7 @@ func CreateBlocks(input IteratorCreator, mint, maxt int64, maxSamplesInAppender
 				}
 
 				l := i.Labels()
-				if _, err := app.Add(i.Labels(), ts, v); err != nil {
+				if _, err := app.Append(0, i.Labels(), ts, v); err != nil {
 					return errors.Wrap(err, fmt.Sprintf("add sample for metric=%s ts=%s value=%f", l, model.Time(ts).Time().Format(time.RFC3339Nano), v))
 				}
 

pkg/backfill/backfill.go

@@ -40,7 +40,7 @@ type writeClient struct {
 
 // newWriteClient creates a new client for remote write.
 func newWriteClient(name string, tenantName string, conf *remote.ClientConfig, logger log.Logger, requestHistogram *prometheus.HistogramVec) (*writeClient, error) {
-	httpClient, err := config_util.NewClientFromConfig(conf.HTTPClientConfig, "bench_write_client", false, false)
+	httpClient, err := config_util.NewClientFromConfig(conf.HTTPClientConfig, "bench_write_client", config_util.WithHTTP2Disabled())
 	if err != nil {
 		return nil, err
 	}

pkg/bench/write_client.go

@@ -57,7 +57,7 @@ func (cmd *PrometheusAnalyseCommand) run(k *kingpin.ParseContext) error {
 
 	ctx, cancel := context.WithTimeout(context.Background(), cmd.readTimeout)
 	defer cancel()
-	metricNames, _, err := v1api.LabelValues(ctx, labels.MetricName, time.Now().Add(-10*time.Minute), time.Now())
+	metricNames, _, err := v1api.LabelValues(ctx, labels.MetricName, nil, time.Now().Add(-10*time.Minute), time.Now())
 	if err != nil {
 		return errors.Wrap(err, "error querying for metric names")
 	}

pkg/commands/analyse_prometheus.go

@@ -8,7 +8,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/grafana/loki/pkg/ruler/manager"
+	"github.com/grafana/loki/pkg/ruler"
 	"github.com/prometheus/prometheus/pkg/rulefmt"
 	log "github.com/sirupsen/logrus"
 	yaml "gopkg.in/yaml.v3"
@@ -132,7 +132,7 @@ func ParseLoki(f string) ([]RuleNamespace, []error) {
 			grps = append(grps, g.RuleGroup)
 		}
 
-		if errs := manager.ValidateGroups(grps...); len(errs) > 0 {
+		if errs := ruler.ValidateGroups(grps...); len(errs) > 0 {
 			return nil, errs
 		}
 

pkg/rules/parser.go

@@ -250,8 +250,8 @@ func TestLintExpressions(t *testing.T) {
 		},
 		{
 			name:     "logql simple",
-			expr:     `count_over_time({ foo != "bar" }[12m]) > 1`,
-			expected: `(count_over_time({foo!="bar"}[12m]) > 1)`,
+			expr:     `count_over_time({ foo = "bar" }[12m]) > 1`,
+			expected: `(count_over_time({foo="bar"}[12m]) > 1)`,
 			count:    1, modified: 1,
 			logql: true,
 		},