Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

*: support Alertmanager API v2 #1982

Merged
merged 2 commits into from
Jan 14, 2020

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.

Signed-off-by: Simon Pasquier <spasquie@redhat.com>
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!

CHANGELOG.md Outdated Show resolved Hide resolved
pkg/alert/alert.go Outdated Show resolved Hide resolved
docs/components/rule.md Show resolved Hide resolved
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