Add support for more user-friendly duration input #246
Conversation
With this pull request, it is possible to write: 6d23h instead of 167h Which is a lot more easy to read. Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
|
user request: prometheus/prometheus#7681 |
model/time.go
Outdated
| @@ -191,67 +191,57 @@ func ParseDuration(durationStr string) (Duration, error) { | |||
| return 0, nil | |||
| } | |||
| matches := durationRE.FindStringSubmatch(durationStr) | |||
| if len(matches) != 3 { | |||
| fmt.Printf("%v", len(matches)) | |||
model/time.go
Outdated
| @@ -191,67 +191,57 @@ func ParseDuration(durationStr string) (Duration, error) { | |||
| return 0, nil | |||
| } | |||
| matches := durationRE.FindStringSubmatch(durationStr) | |||
| if len(matches) != 3 { | |||
| fmt.Printf("%v", len(matches)) | |||
| if len(matches) != 15 { | |||
There was a problem hiding this comment.
Checking for nil is the usual way
|
This would break the people consuming e.g. the rules API. |
|
Mmh in fact no. We return the duration as an integer. So that's not breaking. |
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
|
I have addressed the comments and added more (relevant) tests |
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
|
I have arbitrarily decided when we marshal a duration to only marshal weeks and years if it is the exact count. It means that 14d will be changed to 2w but 92d will stay 92d and not 13w1d. |
model/time.go
Outdated
| } | ||
|
|
||
| m(2, 1000*60*60*24*365) |
There was a problem hiding this comment.
A quick comment here listing the y etc. would make things clearer, especially for anyone glancing through the code trying to find the syntax.
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
|
👍 |
- Disable HTTP2: prometheus/common#249 - Composite duration: prometheus/common#246 Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
- Disable HTTP2: prometheus/common#249 - Composite duration: prometheus/common#246 Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
|
I implemented the frontend side for the graph range input for this here: prometheus/prometheus#7833 |
- Disable HTTP2: prometheus/common#249 - Composite duration: prometheus/common#246 Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
With this pull request, it is possible to write:
6d23h
instead of
167h
Which is a lot more easy to read.
** This is a breaking change, unless we remove the re-marshalling for now. **
Signed-off-by: Julien Pivotto roidelapluie@inuits.eu