Update Prometheus vendoring, adapt Cortex #668
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
juliusv
force-pushed
the
update-prom-vendoring
branch
from
7f3c4a8 to
a1d4089
Compare
|
(and some test updates still needed) |
The most noticeable change is around the lifecycle manager of the Alertmanager notifier and its associated service discovery manager. This has now been moved from the notifier package into main.go in Prometheus and thus we also need to duplicate that lifecycle management ourselves.
juliusv
force-pushed
the
update-prom-vendoring
branch
from
ccf4ddb to
dda18ca
Compare
juliusv
changed the title
|
Ok, tests updated and additionally verified that it still sends notifications in a real setup. @jml Should be ready now. |
jml
approved these changes
Feb 5, 2018
pkg/ruler/ruler.go
Outdated
| notifiers map[string]*rulerNotifier | ||
| } | ||
|
|
||
| type rulerNotifier struct { |
There was a problem hiding this comment.
Can you please add a comment for this explaining what it is and why we want it?
pkg/ruler/ruler.go
Outdated
| } | ||
| delay := 0 * time.Second // Unused, so 0 value is fine. | ||
| return rules.NewGroup("default", "none", delay, rs, opts), nil | ||
| } | ||
|
|
||
| // sendAlerts implements a the rules.NotifyFunc for a Notifier. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is preparatory work for #622
The most noticeable change is around the lifecycle manager of the Alertmanager
notifier and its associated service discovery manager. This has now been moved
from the notifier package into main.go in Prometheus and thus we also need to
duplicate that lifecycle management ourselves.