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

Remove Id return from silences.Set(*pb.Silence) #3881

Merged

Conversation

grobinson-grafana
Copy link
Contributor

@grobinson-grafana grobinson-grafana commented Jun 17, 2024

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.

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 <[email protected]>
@grobinson-grafana grobinson-grafana force-pushed the grobinson/remove-id-from-set branch from c38e0b4 to cc6de9c Compare June 20, 2024 14:48
Copy link
Member

@gotjosh gotjosh left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@simonpasquier simonpasquier merged commit 02a0173 into prometheus:main Jun 21, 2024
11 checks passed
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.
@grobinson-grafana grobinson-grafana deleted the grobinson/remove-id-from-set branch June 25, 2024 15:59
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.

3 participants