#3513: Show muted alerts in the Alert Groups API #3797
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
grobinson-grafana
changed the title
grobinson-grafana
force-pushed
the
grobinson/mark-muted-alerts-4
branch
from
5c4b023
to
ce8652d
Compare
|
I added a checkbox for filtering Muted alerts and a label to show if the alert is muted, like we have for silenced and inhibited alerts.
|
grobinson-grafana
force-pushed
the
grobinson/mark-muted-alerts-4
branch
from
3de4eba
to
08836ab
Compare
grobinson-grafana
force-pushed
the
grobinson/mark-muted-alerts-4
branch
from
08836ab
to
681f2a7
Compare
grobinson-grafana
force-pushed
the
grobinson/mark-muted-alerts-4
branch
from
681f2a7
to
1d227f1
Compare
grobinson-grafana
force-pushed
the
grobinson/mark-muted-alerts-4
branch
from
0c1a5f8
to
0cd1216
Compare
| @@ -86,16 +88,18 @@ type ( | |||
| func NewAPI( | |||
| alerts provider.Alerts, | |||
| gf groupsFn, | |||
| sf getAlertStatusFn, | |||
| asf getAlertStatusFn, | |||
There was a problem hiding this comment.
Not the best variable name, option to suggestions! 😄
| @@ -407,17 +411,22 @@ func (api *API) getAlertGroupsHandler(params alertgroup_ops.GetAlertGroupsParams | |||
| res := make(open_api_models.AlertGroups, 0, len(alertGroups)) | |||
|
|
|||
| for _, alertGroup := range alertGroups { | |||
| mutedBy, isMuted := api.groupMutedFunc(alertGroup.RouteID, alertGroup.GroupKey) | |||
| if !*params.Muted && isMuted { | |||
There was a problem hiding this comment.
This skips muted groups if muted is false.
| @@ -206,6 +206,8 @@ type AlertGroup struct { | |||
| Alerts types.AlertSlice | |||
| Labels model.LabelSet | |||
| Receiver string | |||
| GroupKey string | |||
| RouteID string | |||
There was a problem hiding this comment.
Needed to add RouteID here because we added it to the marker. Without it, we cannot see if a group is muted or not.
This commit updates /api/v2/alerts/groups to show if an alert is suppressed from one or more active or mute time intervals. While the muted by field can be found in /api/v2/alerts, it is not used here because /api/v2/alerts does not take aggregation or routing into consideration. It also updates the UI to support filtering muted alerts via the Muted checkbox. Signed-off-by: George Robinson <george.robinson@grafana.com>
grobinson-grafana
force-pushed
the
grobinson/mark-muted-alerts-4
branch
from
7b804a1
to
6c2a305
Compare
| @@ -117,7 +117,7 @@ func PostableSilenceToProto(s *open_api_models.PostableSilence) (*silencepb.Sile | |||
| } | |||
|
|
|||
| // AlertToOpenAPIAlert converts internal alerts, alert types, and receivers to *open_api_models.GettableAlert. | |||
| func AlertToOpenAPIAlert(alert *types.Alert, status types.AlertStatus, receivers []string) *open_api_models.GettableAlert { | |||
| func AlertToOpenAPIAlert(alert *types.Alert, status types.AlertStatus, receivers, mutedBy []string) *open_api_models.GettableAlert { | |||
There was a problem hiding this comment.
mutedBy is separate from types.AlertStatus because it is related to groups, and does not come from the AlertMarker interface.
Merged
SuperQ
reviewed
Oct 17, 2024
Comment on lines
+91
to
+92
| asf getAlertStatusFn, | ||
| gmf groupMutedFunc, |
There was a problem hiding this comment.
How about this for consistent naming:
Suggested change
| asf getAlertStatusFn, | |
| gmf groupMutedFunc, | |
| asf alertStatusFn, | |
| gmf groupMutedFn, |
There was a problem hiding this comment.
I don't mind the types as these two are consistent:
getAlertStatusFn func(prometheus_model.Fingerprint) types.AlertStatus
setAlertStatusFn func(prometheus_model.LabelSet)It was more the variable names asf and gmf that I didn't like.
SuperQ
approved these changes
Oct 17, 2024
gotjosh
added a commit
that referenced
this pull request
Oct 24, 2024
* Release v0.28.0-rc.0 * [CHANGE] Templating errors in the SNS integration now return an error. #3531 #3879 * [FEATURE] Add a new Microsoft Teams integration based on Flows #4024 * [FEATURE] Add a new Rocket.Chat integration #3600 * [FEATURE] Add a new Jira integration #3590 #3931 * [FEATURE] Add support for `GOMEMLIMIT`, enable it via the feature flag `--enable-feature=auto-gomemlimit`. #3895 * [FEATURE] Add support for `GOMAXPROCS`, enable it via the feature flag `--enable-feature=auto-gomaxprocs`. #3837 * [FEATURE] Add support for limits of silences including the maximum number of active and pending silences, and the maximum size per silence (in bytes). You can use the flags `--silences.max-silences` and `--silences.max-silence-size-bytes` to set them accordingly #3852 #3862 #3866 #3885 #3886 #3877 * [FEATURE] Muted alerts now show whether they are suppressed or not in both the `/api/v2/alerts` endpoint and the Alertmanager UI. #3793 #3797 #3792 * [ENHANCEMENT] Add support for `content`, `username` and `avatar_url` in the Discord integration. `content` and `username` also support templating. #4007 * [ENHANCEMENT] Only invalidate the silences cache if a new silence is created or an existing silence replaced - should improve latency on both `GET api/v2/alerts` and `POST api/v2/alerts` API endpoint. #3961 * [ENHANCEMENT] Add image source label to Dockerfile. To get changelogs shown when using Renovate #4062 * [ENHANCEMENT] Build using go 1.23 #4071 * [ENHANCEMENT] Support setting a global SMTP TLS configuration. #3732 * [ENHANCEMENT] The setting `room_id` in the WebEx integration can now be templated to allow for dynamic room IDs. #3801 * [ENHANCEMENT] Enable setting `message_thread_id` for the Telegram integration. #3638 * [ENHANCEMENT] Support the `since` and `humanizeDuration` functions to templates. This means users can now format time to more human-readable text. #3863 * [ENHANCEMENT] Support the `date` and `tz` functions to templates. This means users can now format time in a specified format and also change the timezone to their specific locale. #3812 * [ENHANCEMENT] Latency metrics now support native histograms. #3737 * [BUGFIX] Fix the SMTP integration not correctly closing an SMTP submission, which may lead to unsuccessful dispatches being marked as successful. #4006 * [BUGFIX] The `ParseMode` option is now set explicitly in the Telegram integration. If we don't HTML tags had not been parsed by default. #4027 * [BUGFIX] Fix a memory leak that was caused by updates silences continuously. #3930 * [BUGFIX] Fix hiding secret URLs when the URL is incorrect. #3887 * [BUGFIX] Fix a race condition in the alerts - it was more of a hypothetical race condition that could have occurred in the alert reception pipeline. #3648 * [BUGFIX] Fix a race condition in the alert delivery pipeline that would cause a firing alert that was delivered earlier to be deleted from the aggregation group when instead it should have been delivered again. #3826 * [BUGFIX] Fix version in APIv1 deprecation notice. #3815 * [BUGFIX] Fix crash errors when using `url_file` in the Webhook integration. #3800 * [BUGFIX] fix `Route.ID()` returns conflicting IDs. #3803 * [BUGFIX] Fix deadlock on the alerts memory store. #3715 * [BUGFIX] Fix `amtool template render` when using the default values. #3725 * [BUGFIX] Fix `webhook_url_file` for both the Discord and Microsoft Teams integrations. #3728 #3745 --------- Signed-off-by: SuperQ <superq@gmail.com> Signed-off-by: gotjosh <josue.abreu@gmail.com> Co-authored-by: gotjosh <josue.abreu@gmail.com>
8 tasks
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.
This commit updates
/api/v2/alerts/groupsto show if an alert is suppressed from one or more active or mute time intervals. While the muted by field can be found in/api/v2/alerts, it is not used here because/api/v2/alertsdoes not take aggregation or routing into consideration.It also updates the UI to support filtering muted alerts via the Muted checkbox.