Vendor update #1510

codesome · 2019-07-12T11:25:44Z

It includes this query optimization.

codesome · 2019-07-12T11:27:04Z

I have opened weaveworks/common#161 for some conflicts.

Signed-off-by: Ganesh Vernekar <[email protected]>

codesome · 2019-07-16T09:25:03Z

The TestChunkStoreRandom which failed in the test seems to be flaky. I ran it on my machine and it failed for the first time and then it did not fail later.

gouthamve · 2019-07-17T05:51:51Z

Do you think the flakyness is caused by the vendor update?

codesome · 2019-07-17T05:53:28Z

I plan to investigate that sometime soon. If it was flaky before we would have seen it in other places too, so it might be the vendor update.

csmarchbanks

I need convincing that alertmanager will still work after this, and instructions on how to upgrade.

go.mod

csmarchbanks · 2019-07-18T17:24:59Z

go.mod

-	github.com/prometheus/common v0.3.0
-	github.com/prometheus/prometheus v0.0.0-20190417125241-3cc5f9d88062
-	github.com/prometheus/tsdb v0.7.2-0.20190506134726-2ae028114c89
+	github.com/prometheus/alertmanager v0.17.0


This is a breaking change. All of the gossip/mesh protocols have changed in this upgrade. At a minimum I would want to see what is necessary to upgrade the alertmanager after this.

Prometheus uses v0.17.0 of alertmanager, hence this gets updated automatically if we want to update prometheus. Also the changes that I did to pkg/alertmanager was not final (was randomly making changes to fit the new API). It still needs testing and verifying.

codesome · 2019-07-19T12:10:55Z

[This PR is still in a Draft stage as I have to verify the changes to alertmanager package and see that it works fine]

codesome · 2019-07-31T13:37:27Z

Plugging this here prometheus/prometheus#5813.

I am going to decouple alertmanager from prometheus and vendor it here instead of bumping the alertmanager version.

Signed-off-by: Ganesh Vernekar <[email protected]>

codesome · 2019-07-31T15:18:52Z

Now I have vendored against remove-alertmanager branch of Prometheus. It only contains this commit on top of Prometheus v2.11.1 which removes the hard dependency on alertmanager by copying only the required models.

This keeps the alertmanager version of cortex unchanged.

Signed-off-by: Ganesh Vernekar <[email protected]>

codesome · 2019-07-31T17:11:16Z

In the same way, alertmanager 0.13.0 was not totally compatible with client_golang 1.0.0. And the latest Prometheus would pull it in.

I created another branch of alertmanager called ganesh-0.13 based on alertmanager 0.13.0, and added this commit on top of it for missing parts (Very hacky. The vendoring in that commit is client_golang 1.0.0 which can be ignored, main change is in api/api.go and ui/web.go where I copy those missing functions (duplicated in both the files)).

csmarchbanks

This looks sane to me. We talked at the community meeting and decided that using the branches was ok for now to not block Prometheus upgrades.

bboreham · 2019-08-22T16:39:14Z

pkg/ruler/notifier.go

@@ -117,6 +117,7 @@ func buildNotifierConfig(rulerConfig *Config) (*config.Config, error) {
 		}
 	}
 	amConfig := &config.AlertmanagerConfig{
+		APIVersion:             config.AlertmanagerAPIVersionV2,


this appears to break alerts completely, since the v2 endpoint is not wired up - #1604

codesome added 2 commits July 12, 2019 17:23

Vendor update

bf37d03

Signed-off-by: Ganesh Vernekar <[email protected]>

Fix legacy_promql

fe036d5

Signed-off-by: Ganesh Vernekar <[email protected]>

codesome force-pushed the vendor branch from 0c0dcf4 to fe036d5 Compare July 12, 2019 11:54

codesome added 2 commits July 15, 2019 19:30

Updated weaveworks/common fix

f54ab42

Signed-off-by: Ganesh Vernekar <[email protected]>

Vendored API conflicts

cb25e14

Signed-off-by: Ganesh Vernekar <[email protected]>

codesome force-pushed the vendor branch from 6c334f1 to cb25e14 Compare July 15, 2019 14:43

Fix alertmanager APIs

9a5d42d

Signed-off-by: Ganesh Vernekar <[email protected]>

codesome force-pushed the vendor branch from eb132d3 to 9a5d42d Compare July 15, 2019 15:45

AlertmanagerAPIVersionV2 in ruler

24cddc7

Signed-off-by: Ganesh Vernekar <[email protected]>

csmarchbanks suggested changes Jul 18, 2019

View reviewed changes

codesome force-pushed the vendor branch from 0545227 to 24cddc7 Compare July 24, 2019 14:01

Merge remote-tracking branch 'upstream/master' into vendor

82fd4c4

tomwilkie mentioned this pull request Jul 31, 2019

Consider not importing api/v2/model from Alertmanager? prometheus/prometheus#5813

Closed

codesome added 2 commits July 31, 2019 20:21

Use remove-alertmanager branch of Prometheus

5d6c805

Signed-off-by: Ganesh Vernekar <[email protected]>

Merge remote-tracking branch 'upstream/master' into vendor

c63d9cb

Signed-off-by: Ganesh Vernekar <[email protected]>

codesome force-pushed the vendor branch from e7fb646 to c63d9cb Compare July 31, 2019 15:12

codesome added 2 commits July 31, 2019 21:06

Undo changes to alertmanager

ebaeef8

Signed-off-by: Ganesh Vernekar <[email protected]>

Modified alertmanager 0.13

6d5fdf6

Signed-off-by: Ganesh Vernekar <[email protected]>

tomwilkie requested review from gouthamve and tomwilkie August 1, 2019 13:33

csmarchbanks approved these changes Aug 1, 2019

View reviewed changes

tomwilkie approved these changes Aug 7, 2019

View reviewed changes

tomwilkie merged commit 0f1f464 into cortexproject:master Aug 7, 2019

bboreham mentioned this pull request Aug 8, 2019

Update alertmanager to upstream v0.15.1 with memberlist #929

Merged

codesome mentioned this pull request Aug 12, 2019

Remove pkg/ingester/wal.pb.go #1575

Merged

codesome mentioned this pull request Aug 20, 2019

Use remove-alertmanager-2.11 branch of Prometheus #1593

Closed

bboreham reviewed Aug 22, 2019

View reviewed changes

jtlisi mentioned this pull request Aug 22, 2019

Ruler Notifier and Alertmanager use different API versions #1604

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Vendor update #1510

Vendor update #1510

Uh oh!

codesome commented Jul 12, 2019

Uh oh!

codesome commented Jul 12, 2019

Uh oh!

codesome commented Jul 16, 2019

Uh oh!

gouthamve commented Jul 17, 2019

Uh oh!

codesome commented Jul 17, 2019 •

edited

Loading

Uh oh!

csmarchbanks left a comment

Uh oh!

Uh oh!

csmarchbanks Jul 18, 2019

Uh oh!

codesome Jul 19, 2019

Uh oh!

codesome commented Jul 19, 2019

Uh oh!

codesome commented Jul 31, 2019

Uh oh!

codesome commented Jul 31, 2019

Uh oh!

codesome commented Jul 31, 2019 •

edited

Loading

Uh oh!

csmarchbanks left a comment

Uh oh!

bboreham Aug 22, 2019 •

edited

Loading

Uh oh!

Uh oh!

Vendor update #1510

Vendor update #1510

Uh oh!

Conversation

codesome commented Jul 12, 2019

Uh oh!

codesome commented Jul 12, 2019

Uh oh!

codesome commented Jul 16, 2019

Uh oh!

gouthamve commented Jul 17, 2019

Uh oh!

codesome commented Jul 17, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

csmarchbanks left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

csmarchbanks Jul 18, 2019

Choose a reason for hiding this comment

Uh oh!

codesome Jul 19, 2019

Choose a reason for hiding this comment

Uh oh!

codesome commented Jul 19, 2019

Uh oh!

codesome commented Jul 31, 2019

Uh oh!

codesome commented Jul 31, 2019

Uh oh!

codesome commented Jul 31, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

csmarchbanks left a comment

Choose a reason for hiding this comment

Uh oh!

bboreham Aug 22, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

codesome commented Jul 17, 2019 •

edited

Loading

codesome commented Jul 31, 2019 •

edited

Loading

bboreham Aug 22, 2019 •

edited

Loading