Skip to content

Vendor prometheus 2.12.0 and alertmanager 0.19.0 #1597

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 13 commits into from
Sep 9, 2019
+262,786 −97,753
Merged

Vendor prometheus 2.12.0 and alertmanager 0.19.0 #1597

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
1f89a2a
Vendor prometheus v2.12.0
Aug 21, 2019
0eadf61
Fix some API changes in alertmanager
Aug 21, 2019
804eff0
Copy the test storage in legacy_promql
Aug 21, 2019
c595cad
Remove prometheus/tsdb
Aug 21, 2019
e016238
Fix arguments for notify.BuildPipeline
Aug 22, 2019
e667f12
Fix AM Register
Aug 26, 2019
23f0b6a
Merge remote-tracking branch 'upstream/master' into vendor-prometheus
Sep 3, 2019
0934e8e
Try alertmanager v0.19.0-rc.0
Sep 3, 2019
53f8b7b
Replace alertmanager 0.19.0-rc.0 with 0.19.0
Sep 3, 2019
2e8acf4
Remove auto slack root
Sep 3, 2019
9966fd6
tsdb iterator re-use
Sep 3, 2019
5c71428
Merge remote-tracking branch 'upstream/master' into vendor-prometheus
Sep 5, 2019
0200fa1
Update changelog
Sep 5, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
## master / unreleased

* [CHANGE] `--alertmanager.configs.auto-slack-root` flag was dropped as auto Slack root is not supported anymore. #1597
* [ENHANCEMENT] Upgraded Prometheus to 2.12.0 and Alertmanager to 0.19.0. #1597

## 0.2.0 / 2019-09-05

This release has several exciting features, the most notable of them being setting `-ingester.spread-flushes` to potentially reduce your storage space by upto 50%.
Expand Down
46 changes: 20 additions & 26 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,64 +3,63 @@ module github.com/cortexproject/cortex
go 1.12

require (
cloud.google.com/go v0.35.0
cloud.google.com/go v0.44.1
github.com/Azure/azure-sdk-for-go v26.3.0+incompatible // indirect
github.com/Azure/go-autorest v11.5.1+incompatible // indirect
github.com/Masterminds/squirrel v0.0.0-20161115235646-20f192218cf5
github.com/NYTimes/gziphandler v1.1.1
github.com/aws/aws-sdk-go v1.15.90
github.com/aws/aws-sdk-go v1.22.4
github.com/bitly/go-hostpool v0.0.0-20171023180738-a3a6125de932 // indirect
github.com/blang/semver v3.5.0+incompatible
github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 // indirect
github.com/bradfitz/gomemcache v0.0.0-20170208213004-1952afaa557d
github.com/cenkalti/backoff v1.0.0 // indirect
github.com/cespare/xxhash v1.1.0
github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd // indirect
github.com/coreos/go-semver v0.3.0 // indirect
github.com/coreos/go-systemd v0.0.0-20181012123002-c6f51f82210d // indirect
github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f // indirect
github.com/cznic/ql v1.2.0 // indirect
github.com/dustin/go-humanize v1.0.0 // indirect
github.com/facette/natsort v0.0.0-20181210072756-2cd4dd1e2dcb
github.com/fluent/fluent-logger-golang v1.2.1 // indirect
github.com/fsouza/fake-gcs-server v1.3.0
github.com/go-kit/kit v0.8.0
github.com/go-kit/kit v0.9.0
github.com/gocql/gocql v0.0.0-20180113133114-697e7c57f99b
github.com/gogo/googleapis v1.1.0 // indirect
github.com/gogo/protobuf v1.2.1
github.com/gogo/protobuf v1.2.2-0.20190730201129-28a6bbf47e48
github.com/gogo/status v1.0.3
github.com/golang/protobuf v1.3.1
github.com/golang/protobuf v1.3.2
github.com/golang/snappy v0.0.1
github.com/gophercloud/gophercloud v0.0.0-20190307220656-fe1ba5ce12dd // indirect
github.com/gorilla/context v1.1.1 // indirect
github.com/gorilla/mux v1.6.2
github.com/gorilla/websocket v1.4.0 // indirect
github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4
github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed // indirect
github.com/hashicorp/consul/api v1.1.0
github.com/hashicorp/go-cleanhttp v0.5.1
github.com/jonboulle/clockwork v0.1.0
github.com/json-iterator/go v1.1.6
github.com/json-iterator/go v1.1.7
github.com/konsorten/go-windows-terminal-sequences v1.0.2 // indirect
github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348 // indirect
github.com/lann/builder v0.0.0-20150808151131-f22ce00fd939 // indirect
github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0 // indirect
github.com/lib/pq v1.0.0
github.com/mattes/migrate v1.3.1
github.com/mattn/go-sqlite3 v1.10.0 // indirect
github.com/oklog/oklog v0.3.2 // indirect
github.com/onsi/ginkgo v1.8.0 // indirect
github.com/onsi/gomega v1.5.0 // indirect
github.com/opentracing-contrib/go-grpc v0.0.0-20180928155321-4b5a12d3ff02
github.com/opentracing-contrib/go-stdlib v0.0.0-20170113013457-1de4cc2120e7
github.com/opentracing-contrib/go-stdlib v0.0.0-20190519235532-cf7a6c988dc9
github.com/opentracing/opentracing-go v1.1.0
github.com/philhofer/fwd v0.0.0-20160129035939-98c11a7a6ec8 // indirect
github.com/pkg/errors v0.8.1
github.com/prometheus/alertmanager v0.15.1
github.com/prometheus/client_golang v1.0.0
github.com/prometheus/common v0.4.1
github.com/prometheus/prometheus v0.0.0-20190731144842-63ed2e28f1ac
github.com/prometheus/tsdb v0.9.1
github.com/prometheus/alertmanager v0.19.0
github.com/prometheus/client_golang v1.1.0
github.com/prometheus/common v0.6.0
github.com/prometheus/prometheus v0.0.0-20190818123050-43acd0e2e93f
github.com/satori/go.uuid v1.2.0 // indirect
github.com/segmentio/fasthash v0.0.0-20180216231524-a72b379d632e
github.com/sercand/kuberesolver v2.1.0+incompatible // indirect
github.com/sirupsen/logrus v1.4.2 // indirect
github.com/spaolacci/murmur3 v1.1.0 // indirect
github.com/stretchr/testify v1.3.0
github.com/tinylib/msgp v0.0.0-20161221055906-38a6f61a768d // indirect
github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5 // indirect
Expand All @@ -73,15 +72,10 @@ require (
go.etcd.io/bbolt v1.3.3
go.etcd.io/etcd v0.0.0-20190709142735-eb7dd97135a5
go.uber.org/zap v1.10.0 // indirect
golang.org/x/crypto v0.0.0-20190530122614-20be4c3c3ed5 // indirect
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3
golang.org/x/sync v0.0.0-20190423024810-112230192c58 // indirect
golang.org/x/sys v0.0.0-20190602015325-4c4f7f33c9ed // indirect
golang.org/x/text v0.3.2 // indirect
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c
google.golang.org/api v0.4.0
google.golang.org/grpc v1.19.1
gopkg.in/fsnotify/fsnotify.v1 v1.4.7 // indirect
golang.org/x/net v0.0.0-20190724013045-ca1201d0de80
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4
google.golang.org/api v0.8.0
google.golang.org/grpc v1.22.1
gopkg.in/yaml.v2 v2.2.2
)

Expand Down
Loading