Skip to content

Upgrade Prometheus to release-2.20 branch #2902

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 4 commits into from
Jul 21, 2020
Merged

Upgrade Prometheus to release-2.20 branch #2902

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
65fea5c
Upgrade Prometheus to release-2.20 branch
codesome Jul 20, 2020
6200013
Fix test
codesome Jul 21, 2020
0da77a3
Updated go.sum
pracucci Jul 21, 2020
93badc9
Update CHANGELOG
codesome Jul 21, 2020
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
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
* `s3.http.idle-conn-timeout`
* `s3.http.response-header-timeout`
* `s3.http.insecure-skip-verify`
* [ENHANCEMENT] Prometheus upgraded. #2798 #2849 #2867
* [ENHANCEMENT] Prometheus upgraded. #2798 #2849 #2867 #2902
* Optimized labels regex matchers for patterns containing literals (eg. `foo.*`, `.*foo`, `.*foo.*`)
* [ENHANCEMENT] Add metric `cortex_ruler_config_update_failures_total` to Ruler to track failures of loading rules files. #2857
* [ENHANCEMENT] Experimental Alertmanager: Alertmanager configuration persisted to object storage using an experimental API that accepts and returns YAML-based Alertmanager configuration. #2768
Expand Down
30 changes: 13 additions & 17 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ require (
github.com/NYTimes/gziphandler v1.1.1
github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d
github.com/armon/go-metrics v0.3.3
github.com/aws/aws-sdk-go v1.31.9
github.com/aws/aws-sdk-go v1.33.5
github.com/blang/semver v3.5.0+incompatible
github.com/bradfitz/gomemcache v0.0.0-20190913173617-a41fca850d0b
github.com/cespare/xxhash v1.1.0
Expand All @@ -28,49 +28,45 @@ require (
github.com/gomodule/redigo v2.0.0+incompatible
github.com/gorilla/mux v1.7.3
github.com/grpc-ecosystem/go-grpc-middleware v1.1.0
github.com/hashicorp/consul/api v1.4.0
github.com/hashicorp/consul/api v1.5.0
github.com/hashicorp/go-cleanhttp v0.5.1
github.com/hashicorp/go-sockaddr v1.0.2
github.com/hashicorp/memberlist v0.2.0
github.com/hashicorp/memberlist v0.2.2
github.com/json-iterator/go v1.1.10
github.com/lib/pq v1.3.0
github.com/mitchellh/go-wordwrap v1.0.0
github.com/ncw/swift v1.0.50
github.com/oklog/ulid v1.3.1
github.com/opentracing-contrib/go-grpc v0.0.0-20180928155321-4b5a12d3ff02
github.com/opentracing-contrib/go-stdlib v0.0.0-20190519235532-cf7a6c988dc9
github.com/opentracing/opentracing-go v1.1.1-0.20200124165624-2876d2018785
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.20.0
github.com/prometheus/alertmanager v0.21.0
github.com/prometheus/client_golang v1.7.1
github.com/prometheus/client_model v0.2.0
github.com/prometheus/common v0.10.0
github.com/prometheus/prometheus v1.8.2-0.20200711170716-492061b24c00
github.com/prometheus/prometheus v1.8.2-0.20200720162558-f762a9ec77b3
github.com/rafaeljusto/redigomock v0.0.0-20190202135759-257e089e14a1
github.com/segmentio/fasthash v0.0.0-20180216231524-a72b379d632e
github.com/spf13/afero v1.2.2
github.com/stretchr/testify v1.5.1
github.com/thanos-io/thanos v0.13.1-0.20200625180332-f078faed1b96
github.com/uber/jaeger-client-go v2.23.1+incompatible
github.com/uber/jaeger-client-go v2.24.0+incompatible
github.com/weaveworks/common v0.0.0-20200512154658-384f10054ec5
go.etcd.io/bbolt v1.3.5-0.20200615073812-232d8fc87f50
go.etcd.io/etcd v0.5.0-alpha.5.0.20200520232829-54ba9589114f
go.uber.org/atomic v1.6.0
go.uber.org/zap v1.14.1 // indirect
golang.org/x/net v0.0.0-20200602114024-627f9648deb9
golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a
golang.org/x/time v0.0.0-20200416051211-89c76fbcd5d1
google.golang.org/api v0.26.0
golang.org/x/net v0.0.0-20200707034311-ab3426394381
golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208
golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e
google.golang.org/api v0.29.0
google.golang.org/grpc v1.29.1
gopkg.in/yaml.v2 v2.3.0
gopkg.in/yaml.v3 v3.0.0-20200603094226-e3079894b1e8
gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776
sigs.k8s.io/yaml v1.2.0
)

replace github.com/Azure/azure-sdk-for-go => github.com/Azure/azure-sdk-for-go v36.2.0+incompatible

replace github.com/Azure/go-autorest => github.com/Azure/go-autorest v13.3.0+incompatible
Comment on lines -70 to -72
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is also to be noted. There is a big bump here after the removal of these replace.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You're right! Could you check the azure changelog for any significative change for us, please? I would focus on azure blob storage only.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hm, the changelog is not useful at all https://github.com/Azure/azure-sdk-for-go/blob/master/CHANGELOG.md

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No issues with azure-sdk-for-go, that is something Prometheus imports (for the service discovery) and follow these guidelines to avoid breaking changes.

The blob storage client uses github.com/Azure/go-autorest and the upgrade has only 1 breaking change which is not concerning (By default, the DoRetryForStatusCodes functions will no longer infinitely retry a request when the response returns an HTTP status code of 429 (StatusTooManyRequests). To opt in to the old behavior set autorest.Count429AsRetry to false.)

We should be good in terms of blob storage.


// Override since git.apache.org is down. The docs say to fetch from github.
replace git.apache.org/thrift.git => github.com/apache/thrift v0.0.0-20180902110319-2566ecd5d999

Expand Down
89 changes: 83 additions & 6 deletions go.sum
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 0 additions & 4 deletions pkg/alertmanager/alertmanager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ import (
"github.com/prometheus/alertmanager/nflog"
"github.com/prometheus/alertmanager/notify"
"github.com/prometheus/alertmanager/notify/email"
"github.com/prometheus/alertmanager/notify/hipchat"
"github.com/prometheus/alertmanager/notify/opsgenie"
"github.com/prometheus/alertmanager/notify/pagerduty"
"github.com/prometheus/alertmanager/notify/pushover"
Expand Down Expand Up @@ -359,9 +358,6 @@ func buildReceiverIntegrations(nc *config.Receiver, tmpl *template.Template, log
for i, c := range nc.SlackConfigs {
add("slack", i, c, func(l log.Logger) (notify.Notifier, error) { return slack.New(c, tmpl, l) })
}
for i, c := range nc.HipchatConfigs {
add("hipchat", i, c, func(l log.Logger) (notify.Notifier, error) { return hipchat.New(c, tmpl, l) })
}
for i, c := range nc.VictorOpsConfigs {
add("victorops", i, c, func(l log.Logger) (notify.Notifier, error) { return victorops.New(c, tmpl, l) })
}
Expand Down
29 changes: 14 additions & 15 deletions pkg/alertmanager/alertmanager_metrics_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ import (

var integrations = []string{
"email",
"hipchat",
"pagerduty",
"wechat",
"pushover",
Expand Down Expand Up @@ -90,24 +89,24 @@ func TestAlertmanagerMetricsStore(t *testing.T) {
cortex_alertmanager_nflog_snapshot_size_bytes 111
# HELP cortex_alertmanager_notification_latency_seconds The latency of notifications in seconds.
# TYPE cortex_alertmanager_notification_latency_seconds histogram
cortex_alertmanager_notification_latency_seconds_bucket{le="1"} 15
cortex_alertmanager_notification_latency_seconds_bucket{le="5"} 21
cortex_alertmanager_notification_latency_seconds_bucket{le="10"} 23
cortex_alertmanager_notification_latency_seconds_bucket{le="15"} 25
cortex_alertmanager_notification_latency_seconds_bucket{le="20"} 27
cortex_alertmanager_notification_latency_seconds_bucket{le="+Inf"} 27
cortex_alertmanager_notification_latency_seconds_sum 99.9
cortex_alertmanager_notification_latency_seconds_count 27
cortex_alertmanager_notification_latency_seconds_bucket{le="1"} 14
cortex_alertmanager_notification_latency_seconds_bucket{le="5"} 19
cortex_alertmanager_notification_latency_seconds_bucket{le="10"} 21
cortex_alertmanager_notification_latency_seconds_bucket{le="15"} 23
cortex_alertmanager_notification_latency_seconds_bucket{le="20"} 24
cortex_alertmanager_notification_latency_seconds_bucket{le="+Inf"} 24
cortex_alertmanager_notification_latency_seconds_sum 77.7
cortex_alertmanager_notification_latency_seconds_count 24
# HELP cortex_alertmanager_notifications_failed_total The total number of failed notifications.
# TYPE cortex_alertmanager_notifications_failed_total counter
cortex_alertmanager_notifications_failed_total{user="user1"} 36
cortex_alertmanager_notifications_failed_total{user="user2"} 360
cortex_alertmanager_notifications_failed_total{user="user3"} 3600
cortex_alertmanager_notifications_failed_total{user="user1"} 28
cortex_alertmanager_notifications_failed_total{user="user2"} 280
cortex_alertmanager_notifications_failed_total{user="user3"} 2800
# HELP cortex_alertmanager_notifications_total The total number of attempted notifications.
# TYPE cortex_alertmanager_notifications_total counter
cortex_alertmanager_notifications_total{user="user1"} 36
cortex_alertmanager_notifications_total{user="user2"} 360
cortex_alertmanager_notifications_total{user="user3"} 3600
cortex_alertmanager_notifications_total{user="user1"} 28
cortex_alertmanager_notifications_total{user="user2"} 280
cortex_alertmanager_notifications_total{user="user3"} 2800
# HELP cortex_alertmanager_silences How many silences by state.
# TYPE cortex_alertmanager_silences gauge
cortex_alertmanager_silences{state="active",user="user1"} 1
Expand Down
2 changes: 1 addition & 1 deletion vendor/github.com/Azure/azure-sdk-for-go/LICENSE
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

34 changes: 11 additions & 23 deletions ...b.com/Azure/azure-sdk-for-go/services/compute/mgmt/2018-10-01/compute/availabilitysets.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion vendor/github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2018-10-01/compute/client.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading