amtool: Fix behavior of adding silence with duration option#2741
Merged
roidelapluie merged 1 commit intoprometheus:mainfrom Oct 18, 2021
Merged
Conversation
endsAt should be calculated from startsAt, not from the current time Signed-off-by: nekketsuuu <nekketsuuu@users.noreply.github.com>
jan--f
reviewed
Oct 18, 2021
Contributor
jan--f
left a comment
There was a problem hiding this comment.
Thanks, I think all this makes sense and the changes look good.
Two questions:
Should we add the startsAt default in the help text?
Should we mention this in the release notes? This does change user visible behavior after all.
Member
|
Yes but the release notes are only crafted during the releases, not in individual PR's. |
Member
|
Thank you! |
Member
|
Note that tests are welcome! Functions do not need to be exported to be tested. |
Member
I don't think it is really needed. |
markoposavec
pushed a commit
to markoposavec/alertmanager
that referenced
this pull request
Nov 4, 2021
…us#2741) endsAt should be calculated from startsAt, not from the current time Signed-off-by: nekketsuuu <nekketsuuu@users.noreply.github.com>
markoposavec
pushed a commit
to markoposavec/alertmanager
that referenced
this pull request
Nov 4, 2021
…us#2741) endsAt should be calculated from startsAt, not from the current time Signed-off-by: nekketsuuu <nekketsuuu@users.noreply.github.com> Signed-off-by: Marko Posavec <Marko.Posavec@infobip.com>
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
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.
Closes #2490, also closes #2740.
amtooltreats--durationoption differently betweenamtool silence addandamtool silence update;amtool silence addcalculatesendsAtastime.Now()+duration, whileamtool silence updatecalculatesendsAtasstartsAt+duration.According to #1298 (comment), it seems that
startsAt+durationis preferable. That also resolves the confusion such as #2490 and #2740.So I changed behavior of
--durationoption ofamtool silence add. Note that this is a breaking change.Local test:
It may be better to add tests for these CLI options. Adding tests, however, will be a little large change to
clipackage because almost all functions ofclipackage are not exported. So I skipped adding tests in this patch.Signed-off-by: nekketsuuu <nekketsuuu@users.noreply.github.com>