-
Notifications
You must be signed in to change notification settings - Fork 2.2k
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
#3513: TimeMuter returns the names of time intervals #3791
Merged
gotjosh
merged 4 commits into
prometheus:main
from
grobinson-grafana:grobinson/mark-muted-alerts-1
Apr 30, 2024
Merged
#3513: TimeMuter returns the names of time intervals #3791
gotjosh
merged 4 commits into
prometheus:main
from
grobinson-grafana:grobinson/mark-muted-alerts-1
Apr 30, 2024
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 was referenced Apr 2, 2024
grobinson-grafana
changed the title
TimeMuter returns the names of time intervals
#3513: TimeMuter returns the names of time intervals
Apr 3, 2024
grobinson-grafana
force-pushed
the
grobinson/mark-muted-alerts-1
branch
2 times, most recently
from
April 11, 2024 14:18
dc9cdaa
to
190d201
Compare
This commit updates the TimeMuter interface to also return the names of the time intervals that muted the alerts. Signed-off-by: George Robinson <[email protected]>
Signed-off-by: George Robinson <[email protected]>
grobinson-grafana
force-pushed
the
grobinson/mark-muted-alerts-1
branch
2 times, most recently
from
April 29, 2024 17:01
4cd7d75
to
cb25d60
Compare
Signed-off-by: George Robinson <[email protected]>
grobinson-grafana
force-pushed
the
grobinson/mark-muted-alerts-1
branch
from
April 29, 2024 17:07
cb25d60
to
f2563cf
Compare
@@ -949,7 +949,7 @@ func (tms TimeMuteStage) Exec(ctx context.Context, l log.Logger, alerts ...*type | |||
return ctx, alerts, nil | |||
} | |||
|
|||
muted, err := tms.muter.Mutes(muteTimeIntervalNames, now) | |||
muted, _, err := tms.muter.Mutes(muteTimeIntervalNames, now) |
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.
We do not have GroupMarker
(added here) so there is nothing to be marked. Use the blank identifier here instead.
gotjosh
approved these changes
Apr 30, 2024
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
Signed-off-by: George Robinson <[email protected]>
grobinson-grafana
force-pushed
the
grobinson/mark-muted-alerts-1
branch
from
April 30, 2024 10:48
5f8b522
to
d2cbd98
Compare
TheMeier
pushed a commit
to TheMeier/alertmanager
that referenced
this pull request
May 3, 2024
…theus#3791) * TimeMuter returns the names of time intervals This commit updates the TimeMuter interface to also return the names of the time intervals that muted the alerts. Signed-off-by: George Robinson <[email protected]> --------- Signed-off-by: George Robinson <[email protected]>
TheMeier
pushed a commit
to TheMeier/alertmanager
that referenced
this pull request
Sep 29, 2024
…theus#3791) * TimeMuter returns the names of time intervals This commit updates the TimeMuter interface to also return the names of the time intervals that muted the alerts. Signed-off-by: George Robinson <[email protected]> --------- Signed-off-by: George Robinson <[email protected]>
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 the TimeMuter interface to also return the names of the time intervals that muted the alerts.