api: support more query filters #1366
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
This change adds 2 new query filters to the /api/v1/alerts endpoint. - active, filter out active alerts when set to 'false' (default: 'true'). - unprocessed, filter out unprocessed alerts when set to 'false' (default: 'true'). The default values ensure that the API behavior remains the same as before when the query filters aren't provided. Signed-off-by: Simon Pasquier <spasquie@redhat.com>
stuartnelson3
suggested changes
May 7, 2018
| @@ -20,26 +21,72 @@ import ( | |||
| "github.com/stretchr/testify/require" | |||
| ) | |||
|
|
|||
| // fakeAlerts is a struct implementing the provider.Alerts interface for tests. | |||
api/api_test.go
Outdated
| false, | ||
| map[string]string{"filter": "{alertname"}, | ||
| 400, | ||
| []string{"alert1", "alert2", "alert3", "alert4"}, |
There was a problem hiding this comment.
this []string{} should probably be empty, since it's not being executed anyway because of the 400.
| @@ -88,6 +136,167 @@ func TestAddAlerts(t *testing.T) { | |||
| } | |||
| } | |||
|
|
|||
| func TestListAlerts(t *testing.T) { | |||
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
|
@stuartnelson3 thanks for spotting the inconsistency! |
stuartnelson3
approved these changes
May 7, 2018
stuartnelson3
added a commit
that referenced
this pull request
May 7, 2018
Support the new filter options in the alerts api endpoint introduced by #1366 Signed-off-by: stuart nelson <stuartnelson3@gmail.com>
stuartnelson3
added a commit
that referenced
this pull request
May 7, 2018
Support the new filter options in the alerts api endpoint introduced by #1366 Signed-off-by: stuart nelson <stuartnelson3@gmail.com>
stuartnelson3
added a commit
that referenced
this pull request
May 9, 2018
* cli alert query: Expose --active and --unprocessed Support the new filter options in the alerts api endpoint introduced by #1366 Signed-off-by: stuart nelson <stuartnelson3@gmail.com> * Update comment and client_test Signed-off-by: stuart nelson <stuartnelson3@gmail.com>
hh
pushed a commit
to ii/alertmanager
that referenced
this pull request
Jun 4, 2019
Cherry-pick two bug fixes into 0.18.1. Signed-off-by: Ben Kochie <superq@gmail.com>
hh
pushed a commit
to ii/alertmanager
that referenced
this pull request
Jun 4, 2019
Cherry-pick two bug fixes into 0.18.1. Signed-off-by: Ben Kochie <superq@gmail.com>
hh
pushed a commit
to ii/alertmanager
that referenced
this pull request
Jun 4, 2019
Cherry-pick two bug fixes into 0.18.1. Signed-off-by: Ben Kochie <superq@gmail.com>
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.
Fixes #1359.
This change adds 2 new query filters to the /api/v1/alerts endpoint.
(default: 'true').
The default values ensure that the API behavior remains the same as
before when the query filters aren't provided.
cc @stuartnelson3