-
Notifications
You must be signed in to change notification settings - Fork 491
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.
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
chore: update prometheus dependency for service discovery #2536
Conversation
Do we want a changelog for this? |
@@ -1,58 +0,0 @@ | |||
FROM 32bit/ubuntu:16.04 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Delete the 32 bit tests since we will soon be deleting the 32 bit build.
a94ebff
to
8ccd227
Compare
github.com/pierrec/lz4 v2.5.2+incompatible // indirect | ||
github.com/pkg/errors v0.9.1 | ||
github.com/prometheus/common v0.20.0 | ||
github.com/prometheus/prometheus v1.8.2-0.20210331101223-3cafc58827d1 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is actually tag v2.26.0 of prometheus, but prometheus/prometheus#6048 prevents us from using the semver name, we have to specify the commit instead.
8ccd227
to
b25ed27
Compare
mgr interface { | ||
ApplyConfig(cfg *config.Config) error | ||
Stop() | ||
Start() |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The prometheus fork we had was just to split Run
into Start
and Wait
. But the latest version of prometheus looks like it should support calling Stop
before Run
in racy cases, so I don't think we need the fork any longer.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
awesome!
c224fa0
to
6e110ea
Compare
Closes: #2532 There were significant reformatting changes in the prometheus service discovery packages and their configuration, but it seems like the logic is mostly similar.
6e110ea
to
c46b60b
Compare
@@ -27,11 +28,11 @@ type Config struct { | |||
SSLServerName string `toml:"ssl-server-name" override:"ssl-server-name"` | |||
// Use SSL but skip chain & host verification | |||
InsecureSkipVerify bool `toml:"insecure-skip-verify" override:"insecure-skip-verify"` | |||
// This previously supported Timeout but it was removed, see https://github.com/prometheus/common/pull/123 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This needs a docs change.
Closes: #2532 There were significant reformatting changes in the prometheus service discovery packages and their configuration, but it seems like the logic is mostly similar.
Closes: #2532
There were significant reformatting changes in the prometheus service discovery
packages and their configuration, but it seems like the logic is mostly similar.
Required for all non-trivial PRs