This repository has been archived by the owner on Aug 23, 2023. It is now read-only.
storage-aggregation.conf parsing fixes #1989
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
fkaleo
reviewed
Jun 18, 2021
fkaleo
approved these changes
Jun 18, 2021
BEFORE:
aggregations_test.go:318: testcase "defaults with some comments" expected
exp agg {Data:[{Name:foo Pattern:foo.* XFilesFactor:0.5 AggregationMethod:[avg]}] DefaultAggregation:{Name:default Pattern:.* XFilesFactor:0.5 AggregationMethod:[avg]}}
got agg {Data:[{Name:foo Pattern:foo.* # another comment here XFilesFactor:0.5 AggregationMethod:[avg]}] DefaultAggregation:{Name:default Pattern:.* XFilesFactor:0.5 AggregationMethod:[avg]}}
AFTER:
aggregations_test.go:320: testcase "defaults with some comments" mismatch (-want +got):
conf.Aggregations(
- {
- Data: []conf.Aggregation{
- {
- Name: "foo",
- Pattern: s"foo.*",
- XFilesFactor: 0.5,
- AggregationMethod: []conf.Method{s"avg"},
- },
- },
- DefaultAggregation: conf.Aggregation{
- Name: "default",
- Pattern: s".*",
- XFilesFactor: 0.5,
- AggregationMethod: []conf.Method{s"avg"},
- },
- },
+ {
+ Data: []conf.Aggregation{
+ {
+ Name: "foo",
+ Pattern: s"foo.* # another comment here",
+ XFilesFactor: 0.5,
+ AggregationMethod: []conf.Method{s"avg"},
+ },
+ },
+ DefaultAggregation: conf.Aggregation{
+ Name: "default",
+ Pattern: s".*",
+ XFilesFactor: 0.5,
+ AggregationMethod: []conf.Method{s"avg"},
+ },
+ },
)
fkaleo
approved these changes
Jun 22, 2021
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
why fork it? well, to review this properly, you'll have to look at all the commits that https://github.com/grafana/configparser adds on top of upstream, but in particular
add a bunch of unit tests (to test our storage-aggregation.conf use case on top of configparser)
thanks to the fork, fix a bunch of issues:
Why do we need this now?
it's not critical to fix this for metrictank now, however i'ld like to use this library in carbon-relay-ng, and there we must accommodate whatever files the user throw at us.