RepoMirrors
/
alertmanager
mirror of https://github.com/prometheus/alertmanager
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixes #1615 (#1620) 

Support `w` duration when making silences. Remove
`y` as a supported duration, silences are for
short term notification prevention.

Signed-off-by: stuart nelson <stuartnelson3@gmail.com>
This commit is contained in:
stuart nelson 2018-11-13 15:08:37 +01:00 committed by GitHub
parent 86129874d1
commit 72e6720bea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
asset/assets_vfsdata.go
View File

File diff suppressed because one or more lines are too long

2
ui/app/src/Utils/Date.elm
View File

@ -46,7 +46,7 @@ durationHelp duration =
units : List ( String, number ) units : List ( String, number )
units = units =
[ ( "y", 31556926000 ) [ ( "w", 604800000 )
, ( "d", 86400000 ) , ( "d", 86400000 )
, ( "h", 3600000 ) , ( "h", 3600000 )
, ( "m", 60000 ) , ( "m", 60000 )