-
Notifications
You must be signed in to change notification settings - Fork 11.8k
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
Alerting: Manage remote Alertmanager silences #75452
Merged
santihernandezc
merged 5 commits into
main
from
santihernandezc/manage_remote_alertmanager_silences
Oct 2, 2023
Merged
Alerting: Manage remote Alertmanager silences #75452
santihernandezc
merged 5 commits into
main
from
santihernandezc/manage_remote_alertmanager_silences
Oct 2, 2023
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
santihernandezc
commented
Sep 26, 2023
yuri-tceretian
approved these changes
Sep 26, 2023
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
…ernandezc/manage_remote_alertmanager_silences
gotjosh
approved these changes
Sep 29, 2023
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
bergquist
added a commit
that referenced
this pull request
Oct 2, 2023
* main: (51 commits) Postgres: Make securejson password optional (#75801) Alerting: Manage remote Alertmanager silences (#75452) Replace use of `relref` shortcode with `docs/reference` so links work in Grafana Cloud (#75433) Add canonical for testing new canonical behavior in Grafana Cloud (#75745) InfluxDB SQL: Remove default limitation in the query (#75749) Publish documentation from the HEAD of the matching version branch on tag events (#73809) IDforwarding: forward signed id to plugins (#75651) Navtree: Rename page title from "Infrastructure" to "Integrations" (#75721) Changelog: Updated changelog for 9.5.12 (#75776) Chore: update latest.json to 10.1.4 (#75773) Changelog: Updated changelog for 10.1.4 (#75769) Changelog: Updated changelog for 10.0.8 (#75768) Tempo: TraceQL results as a spans list (#75660) Bug: Exclude 32-bit `arm` builds (#75448) Transformations: Fix inconsistent wording of transformation descriptions (#75746) i18n: dashboard import page (#75664) Fix issue-labeled GitHub Action (#75753) Schema: link table panel to the schema definitions (#75671) Plugins: Move alias support to plugin json (but still hardcoded) (#75129) Sandbox: allow access to window.grafanaBootData for plugins (#75522) ...
mildwonkey
pushed a commit
that referenced
this pull request
Oct 4, 2023
* Alerting: Manage remote Alertmanager silences * fix typo * check errors when encoding json in fake external AM * take path from configured URL, check for nil responses
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.
Description
This PR allows Grafana to manage silences on an external Alertmanager the same way we handle silences in the internal Alertmanager.
It uses the upstream Alertmanager client to make HTTP requests and a custom round-tripper to add basic auth credentials and custom headers.
Note: all silence-related methods now take a
context.Context
as the first argument