Remove Id return from silences.Set(*pb.Silence)#3881
Merged
simonpasquier merged 1 commit intoprometheus:mainfrom Jun 21, 2024
Merged
Remove Id return from silences.Set(*pb.Silence)#3881simonpasquier merged 1 commit intoprometheus:mainfrom
simonpasquier merged 1 commit intoprometheus:mainfrom
Conversation
grobinson-grafana
force-pushed
the
grobinson/remove-id-from-set
branch
from
f081296 to
c38e0b4
Compare
This commit removes the Id from the method silences.Set(*pb.Silence) as it is redundant. The Id is still set even when creating a silence fails. This will be fixed in a later change. Signed-off-by: George Robinson <george.robinson@grafana.com>
grobinson-grafana
force-pushed
the
grobinson/remove-id-from-set
branch
from
c38e0b4 to
cc6de9c
Compare
simonpasquier
approved these changes
Jun 21, 2024
grobinson-grafana
added a commit
to grobinson-grafana/alertmanager
that referenced
this pull request
Jun 24, 2024
This commit updates the Upsert method to return just an error instead of the previous (string, error). This brings it up to date with changes upstream (prometheus#3881) where we removed the string return value because it was redundant. If error is non-nil, then the id is assigned to the *pb.Silence and does not need to be returned.
yuri-tceretian
pushed a commit
to grafana/prometheus-alertmanager
that referenced
this pull request
Oct 15, 2025
This commit updates the Upsert method to return just an error instead of the previous (string, error). This brings it up to date with changes upstream (prometheus#3881) where we removed the string return value because it was redundant. If error is non-nil, then the id is assigned to the *pb.Silence and does not need to be returned.
yuri-tceretian
pushed a commit
to grafana/prometheus-alertmanager
that referenced
this pull request
Oct 15, 2025
This commit updates the Upsert method to return just an error instead of the previous (string, error). This brings it up to date with changes upstream (prometheus#3881) where we removed the string return value because it was redundant. If error is non-nil, then the id is assigned to the *pb.Silence and does not need to be returned.
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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 removes the Id from the method
silences.Set(*pb.Silence)as it is redundant. The Id is still set even when creating a silence fails. This will be fixed in a later change.