Update promtail to support duration string formats #5290
Merged
Conversation
This file contains 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
ssncferreira
force-pushed
the
issue/5288-promtail_metrics_duration_string
branch
3 times, most recently
from
1a1c3d3
to
0715029
Compare
ssncferreira
commented
Feb 1, 2022
| func getFloatFromString(str string) (float64, error) { | ||
| dur, err := strconv.ParseFloat(str, 64) | ||
| if err != nil { | ||
| dur, err := time.ParseDuration(str) |
There was a problem hiding this comment.
@dannykopping you suggested using ParseDuration from github.com/prometheus/common/model instead of the one from time package. They support different time units:
- prometheus: supports bigger time units "y", "w", "d", "h", "m", "s", "ms"
https://github.com/grafana/loki/blob/main/vendor/github.com/prometheus/common/model/time.go#L186 - time: supports smaller time units "ns", "us", "ms", "s", "m", "h"
I would say that the one from time package has the most suitable set for this use case. Wdyt?
There was a problem hiding this comment.
I tend to agree; I think the smaller units are probably more valuable here. Good call
dannykopping
approved these changes
Feb 2, 2022
| func getFloatFromString(str string) (float64, error) { | ||
| dur, err := strconv.ParseFloat(str, 64) | ||
| if err != nil { | ||
| dur, err := time.ParseDuration(str) |
There was a problem hiding this comment.
I tend to agree; I think the smaller units are probably more valuable here. Good call
ssncferreira
force-pushed
the
issue/5288-promtail_metrics_duration_string
branch
from
2d025f3
to
d422760
Compare
dannykopping
approved these changes
Feb 3, 2022
ssncferreira
force-pushed
the
issue/5288-promtail_metrics_duration_string
branch
from
d422760
to
626650d
Compare
KMiller-Grafana
pushed a commit
to KMiller-Grafana/loki
that referenced
this pull request
Feb 4, 2022
* Update promtail to support duration string formats * Address comments
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.
What this PR does / why we need it:
Promtail metrics support duration string formats
Which issue(s) this PR fixes:
Fixes #5288
Special notes for your reviewer:
Checklist
CHANGELOG.mdabout the changes.