Skip to content

*: support Alertmanager API v2#1982

Merged
GiedriusS merged 2 commits intothanos-io:masterfrom
simonpasquier:support-api-v2-alertmanager
Jan 14, 2020
Merged

*: support Alertmanager API v2#1982
GiedriusS merged 2 commits intothanos-io:masterfrom
simonpasquier:support-api-v2-alertmanager

Conversation

@simonpasquier
Copy link
Contributor

  • I added CHANGELOG entry for this change.
  • Change is not relevant to the end user.

Changes

Added a new parameter to the alerting configuration similar to what we have in the Prometheus configuration.

Verification

End-to-end tests modified to verify both v1 and v2 endpoints.

@simonpasquier simonpasquier force-pushed the support-api-v2-alertmanager branch from c80c7bc to 26a9da5 Compare January 10, 2020 15:56
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
@simonpasquier simonpasquier force-pushed the support-api-v2-alertmanager branch from 26a9da5 to ffc6d7b Compare January 13, 2020 16:52
Copy link
Member

@GiedriusS GiedriusS left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Some very small things but otherwise looks good to me! Thanks!

Signed-off-by: Simon Pasquier <spasquie@redhat.com>
@GiedriusS GiedriusS merged commit a2dcfa9 into thanos-io:master Jan 14, 2020
@simonpasquier simonpasquier deleted the support-api-v2-alertmanager branch January 14, 2020 14:24
@simonpasquier
Copy link
Contributor Author

Thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants