Chore: Upgrade Prometheus and Cortex (#4017)

* Chore: Upgrade Prometheus

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>

* Upgrade Cortex

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>

* Upgrade Cortex

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>

* Fix build errors

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>

* Fix build errors

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>

* Fix build errors

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>

* Undo unnecessary changes

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>

cmd/querytee/main.go

@@ -6,6 +6,7 @@ import (
 
 	"github.com/go-kit/kit/log/level"
 	"github.com/prometheus/client_golang/prometheus"
+	"github.com/prometheus/client_golang/prometheus/collectors"
 	"github.com/weaveworks/common/logging"
 	"github.com/weaveworks/common/server"
 
@@ -35,7 +36,7 @@ func main() {
 
 	// Run the instrumentation server.
 	registry := prometheus.NewRegistry()
-	registry.MustRegister(prometheus.NewGoCollector())
+	registry.MustRegister(collectors.NewGoCollector())
 
 	i := querytee.NewInstrumentationServer(cfg.ServerMetricsPort, registry)
 	if err := i.Start(); err != nil {

go.mod

@@ -12,12 +12,10 @@ require (
 	github.com/buger/jsonparser v1.1.1
 	github.com/c2h5oh/datasize v0.0.0-20200112174442-28bbd4740fee
 	github.com/cespare/xxhash/v2 v2.1.1
-	github.com/containerd/fifo v0.0.0-20190226154929-a9fb20d87448 // indirect
 	github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf
-	github.com/cortexproject/cortex v1.9.1-0.20210721130445-d9e1f81f40c6
+	github.com/cortexproject/cortex v1.9.1-0.20210722081137-485474c9afb2
 	github.com/davecgh/go-spew v1.1.1
-	github.com/docker/docker v20.10.6+incompatible
-	github.com/docker/go-metrics v0.0.0-20181218153428-b84716841b82 // indirect
+	github.com/docker/docker v20.10.7+incompatible
 	github.com/docker/go-plugins-helpers v0.0.0-20181025120712-1e6269c305b8
 	github.com/drone/envsubst v1.0.2
 	github.com/dustin/go-humanize v1.0.0
@@ -45,7 +43,7 @@ require (
 	github.com/jmespath/go-jmespath v0.4.0
 	github.com/joncrlsn/dque v2.2.1-0.20200515025108-956d14155fa2+incompatible
 	github.com/json-iterator/go v1.1.11
-	github.com/klauspost/compress v1.11.3
+	github.com/klauspost/compress v1.11.13
 	github.com/klauspost/pgzip v1.2.5
 	github.com/mitchellh/mapstructure v1.4.1
 	github.com/modern-go/reflect2 v1.0.1
@@ -54,27 +52,27 @@ require (
 	// github.com/pierrec/lz4 v2.0.5+incompatible
 	github.com/pierrec/lz4/v4 v4.1.7
 	github.com/pkg/errors v0.9.1
-	github.com/prometheus/client_golang v1.10.0
+	github.com/prometheus/client_golang v1.11.0
 	github.com/prometheus/client_model v0.2.0
-	github.com/prometheus/common v0.26.1-0.20210603143733-6ef301f414bf
-	github.com/prometheus/prometheus v1.8.2-0.20210510213326-e313ffa8abf6
+	github.com/prometheus/common v0.29.0
+	github.com/prometheus/prometheus v1.8.2-0.20210720084720-59d02b5ef003
 	github.com/segmentio/fasthash v1.0.2
 	github.com/shurcooL/httpfs v0.0.0-20190707220628-8d4bc4ba7749
 	github.com/shurcooL/vfsgen v0.0.0-20200824052919-0d455de96546
 	github.com/spf13/afero v1.2.2
 	github.com/stretchr/testify v1.7.0
 	github.com/tonistiigi/fifo v0.0.0-20190226154929-a9fb20d87448
-	github.com/uber/jaeger-client-go v2.28.0+incompatible
+	github.com/uber/jaeger-client-go v2.29.1+incompatible
 	github.com/ugorji/go v1.1.7 // indirect
 	github.com/weaveworks/common v0.0.0-20210419092856-009d1eebd624
 	go.etcd.io/bbolt v1.3.5
-	go.uber.org/atomic v1.7.0
+	go.uber.org/atomic v1.8.0
 	go.uber.org/goleak v1.1.10
-	golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83
-	golang.org/x/net v0.0.0-20210525063256-abc453219eb5
-	golang.org/x/sys v0.0.0-20210503173754-0981d6026fa6
-	google.golang.org/api v0.46.0
-	google.golang.org/grpc v1.37.0
+	golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e
+	golang.org/x/net v0.0.0-20210610132358-84b48f89b13b
+	golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1
+	google.golang.org/api v0.48.0
+	google.golang.org/grpc v1.38.0
 	gopkg.in/alecthomas/kingpin.v2 v2.2.6
 	gopkg.in/fsnotify.v1 v1.4.7
 	gopkg.in/yaml.v2 v2.4.0

pkg/ruler/compat.go

@@ -283,7 +283,7 @@ func testTemplateParsing(rl *rulefmt.RuleNode) (errs []error) {
 	}
 
 	// Trying to parse templates.
-	tmplData := template.AlertTemplateData(map[string]string{}, map[string]string{}, 0)
+	tmplData := template.AlertTemplateData(map[string]string{}, map[string]string{}, "", 0)
 	defs := []string{
 		"{{$labels := .Labels}}",
 		"{{$externalLabels := .ExternalLabels}}",

pkg/ruler/memstore_test.go

@@ -46,6 +46,7 @@ func TestSelectRestores(t *testing.T) {
 			labels.FromMap(map[string]string{"foo": "bar"}),
 			nil,
 			nil,
+			"",
 			false,
 			NilLogger,
 		),
@@ -144,6 +145,7 @@ func TestMemstoreStart(t *testing.T) {
 			labels.FromMap(map[string]string{"foo": "bar"}),
 			nil,
 			nil,
+			"",
 			false,
 			NilLogger,
 		),
@@ -181,6 +183,7 @@ func TestMemstoreBlocks(t *testing.T) {
 			labels.FromMap(map[string]string{"foo": "bar"}),
 			nil,
 			nil,
+			"",
 			false,
 			NilLogger,
 		),