Update to v0.16.0 #18
Merged
Conversation
This file contains 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
Signed-off-by: Guido García <guido.garciabernardo@telefonica.com>
Signed-off-by: Max Leonard Inden <IndenML@gmail.com>
*: Cut 0.15.0 merge to master
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
- Add entry for working dir change in Alertmanager Docker image - Indicate cluster flag changes Signed-off-by: Max Leonard Inden <IndenML@gmail.com>
CHANGELOG.md: Improve [CHANGE] section of v0.15.0 release
Signed-off-by: Waldemar Biller <wbiller@gmail.com>
fix: email template typo in alert-warning style
The YAML strict mode doesn't allow mapping keys that are duplicates. If someone wants to override one of the default keys in the Details hash, the unmarshal function returns an error because the key is already defined by DefaultPagerdutyConfig. Signed-off-by: Simon Pasquier <spasquie@redhat.com>
To ensure we include the breaking change notice in the next release notes, this patch adds a 'Next release' section mentioning the breaking change of the working directory of the Alertmanager Dockerfile. Signed-off-by: Max Leonard Inden <IndenML@gmail.com>
notify: catch templating errors for Wechat
…gelog CHANGELOG.md: Add 'Next release' section with docker working dir change
The memberlist library fails when it can't find a private address and no advertise address is given. To return a helpful message to the user, AlertManager mimics the logic from memberlist. However the code had a bug that swallowed the error message and made it difficult for the user to understand how to fix the problem. Signed-off-by: Simon Pasquier <spasquie@redhat.com>
* cluster: make sure we don't miss the first pushPull During the join, memberlist initiates a pushPull to get initial data. Unfortunately, at this point the nflog and silence listener have not been registered yet, so the first data arrives only after one pushPull cycle (1min by default !). Signed-off-by: Corentin Chary <c.chary@criteo.com>
* amtool: add support for stdin to check-config Signed-off-by: Simon Pasquier <spasquie@redhat.com> * Address Stuart's comment Signed-off-by: Simon Pasquier <spasquie@redhat.com>
* fix concurrent read and wirte group Signed-off-by: denghuan <denghuan@actionsky.com> * make lock more elegant Signed-off-by: denghuan <denghuan@actionsky.com>
Alertmanager is exiting with a non-zero exit code if the initial cluster join fails. This behavior could be not wanted because: - As Alertmanager is a critical component with an at-least-once guarantee, failing on joining the cluster is unnecessary as Alertmanager still functions by itself. - In an environment like Kubernetes discovering peers via DNS, peers might roll out one-by-one, leaving the DNS entries unpopulated for the first peer of a set. Failing on initial join prevents a roll-out. Instead of failing on the initial join this patch only logs the failure. The cluster can be later joined via the `handleReconnect`. This is a regression introduced in PR prometheus#1456 [1]. [1] prometheus#1456 Signed-off-by: Max Leonard Inden <IndenML@gmail.com>
Signed-off-by: Max Leonard Inden <IndenML@gmail.com>
* Add support for adding alerts using amtool Signed-off-by: Bob Shannon <bshannon@palantir.com> * comment: Simplify return in addAlert Signed-off-by: Bob Shannon <bshannon@palantir.com>
Signed-off-by: stuart nelson <stuartnelson3@gmail.com>
Signed-off-by: Mark Van De Weert <mark.vandeweert@wpengine.com>
- `tmplText` and `tmplHTML` are using a monad-style error handling [1]. This reduces the verbosity of the error logic, but introduces the risk of forgetting the final error check. This patch does not remove this coding-style, but ensures proper error checking in the Email and PagerDuty notifier. - Ensure to handle errors returned by `multipartWriter.Close()` and `wc.Write(buffer.Bytes())` in `Email.Notify()`. [1] https://www.innoq.com/en/blog/golang-errors-monads/ Signed-off-by: Max Leonard Inden <IndenML@gmail.com>
Signed-off-by: Benjamin Chess <bchess@gmail.com>
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
* config: validate URLs at config load time Signed-off-by: Simon Pasquier <spasquie@redhat.com> * Address Brian and Lucas comments Signed-off-by: Simon Pasquier <spasquie@redhat.com> * Shallow copy of URL instead of reparsing it Signed-off-by: Simon Pasquier <spasquie@redhat.com> * Unshadow net/url package Signed-off-by: Simon Pasquier <spasquie@redhat.com> * Make a deep-copy of URL struct Signed-off-by: Simon Pasquier <spasquie@redhat.com>
`honnef.co/go/tools/cmd/staticcheck` complains with `config/config_test.go:260:32: regular expression does not contain any meta characters (SA6004)`. Instead of using a RegEx this patch simply switches to using Golangs `strings.Count` function. Signed-off-by: Max Leonard Inden <IndenML@gmail.com>
config/test: Count `<secret>` occurrences via golang strings
Signed-off-by: Adam Shannon <adamkshannon@gmail.com>
…eus#1483) This adds compatiblity with PagerDuty's Event rules feature, allowing resolve events to be routed based on attributes Fixes prometheus#1440 Signed-off-by: Mike Bryant <m@ocado.com>
…#1686) If the original EndsAt is left in place, then as time moves forwards past the EndsAt then firing alerts will be rendered and treated as resolved alerts which can cause confusion and races. This is most likely to happen on retries for a notification. Mitigate race and fix data races in TestAggrGroup. Signed-off-by: Brian Brazil <brian.brazil@robustperception.io>
prometheus#1693) * simplified setting first assumed alertname in cli/silence_query.go * added assumed first label to alertname when adding silences Signed-off-by: Hrishikesh Barman <hrishikeshbman@gmail.com>
* Remove inhibited/silenced text In the alert list, this is already seen via the icons. In the silence preview, since it's in the silence preview, clearly it's affected by the silence. * Generate assets Signed-off-by: stuart nelson <stuartnelson3@gmail.com>
* Respect regexes when recreating silences * Generate assets Signed-off-by: stuart nelson <stuartnelson3@gmail.com>
) * Support adding custom fields to VictorOps notifications * Response to feedback * Added logic to validate victorops custom fields to config load time * Cleanup victorops notifier of logic duplicated in config check * rebase and further cleanup from feedback * another grammer fix Signed-off-by: Jason Roberts <jroberts@drud.com>
The variable DefaultGlobalConfig was being used to initialize values, but it stored previous information due to which some things were persisting in the newer initialization. In this PR, DefaultGlobalConfig is changed to a function so that it returns a fresh GlobalConfig for initialization. Signed-off-by: Hrishikesh Barman <hrishikeshbman@gmail.com>
Signed-off-by: Max Leonard Inden <IndenML@gmail.com>
By default go-swagger serves the swagger spec and the redoc UI. This patch disables both. Signed-off-by: Max Leonard Inden <IndenML@gmail.com>
Signed-off-by: Max Leonard Inden <IndenML@gmail.com>
openshift-ci-robot
added
approved
|
/hold |
openshift-ci-robot
added
the
do-not-merge/hold
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
simonpasquier
force-pushed
the
aos-bump-0.16.0
branch
from
40c56bd
to
9de328f
Compare
|
/lgtm |
pgier
approved these changes
Jan 21, 2019
|
/retest |
|
/hold |
|
/lgtm |
|
@brancz: changing LGTM is restricted to assignees, and only openshift/prometheus-alertmanager repo collaborators may be assigned issues. In response to this:
Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: brancz, pgier, simonpasquier The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
|
Exception was approved. /hold cancel |
openshift-ci-robot
removed
the
do-not-merge/hold
|
Thanks @brancz! |
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.
No description provided.