Sync ui-rewrite with master (#790)

Browse Source

* 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)

...

This commit is contained in:

Max Inden 2017-05-12 12:55:29 +02:00 committed by GitHub

parent e5042e4d3b

commit eae47b5f01

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available