*: cut v0.6.2 #777
Merged
*: cut v0.6.2 #777
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
mxinden
approved these changes
May 9, 2017
|
lots for a patch release but lgtm |
mxinden
added a commit
that referenced
this pull request
May 12, 2017
* Anchor silence regex rules When user creates a new silence with regex match it's left to the user to anchor it, which is not consistent with Prometheus regex handling (promql/functions.go#L818). * Serialize AlertStatus as 'status' AlertStatus doesn't have json tag with the field name, so it's serialized into 'Status', and it's the only uppercase field in the alert object. Tag it with 'status' name for consistency * Fix lock usage in the types package Locking is a bit tricky there since some state-modifying methods will call to other methods that also modify marker state, simple defer won't work. * Throw error when continue in route root of Alertmanager config * Fix alert status handling in UI * Fixes #746 Found that we are only defining MarshalJSON for the Regexp type for references not for the direct object Also took the time to simplify the json.Unmarshal usage in cli/config.go * Added unit test for continue in root route error (#768) * Added unit test for continue in root route error * replaced %v with %q * Fix broken link to silence from alert * Fix broken link to silence from alert * *: cut v0.6.2 (#777) * Show startsAt time for pending silences (#778)
mxinden
added a commit
that referenced
this pull request
May 12, 2017
* Anchor silence regex rules When user creates a new silence with regex match it's left to the user to anchor it, which is not consistent with Prometheus regex handling (promql/functions.go#L818). * Serialize AlertStatus as 'status' AlertStatus doesn't have json tag with the field name, so it's serialized into 'Status', and it's the only uppercase field in the alert object. Tag it with 'status' name for consistency * Fix lock usage in the types package Locking is a bit tricky there since some state-modifying methods will call to other methods that also modify marker state, simple defer won't work. * Throw error when continue in route root of Alertmanager config * Fix alert status handling in UI * Fixes #746 Found that we are only defining MarshalJSON for the Regexp type for references not for the direct object Also took the time to simplify the json.Unmarshal usage in cli/config.go * Added unit test for continue in root route error (#768) * Added unit test for continue in root route error * replaced %v with %q * Fix broken link to silence from alert * Fix broken link to silence from alert * *: cut v0.6.2 (#777) * Show startsAt time for pending silences (#778) * docs: Add note to not load balance Alert trafic
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.