Look up config file in default locations #6160
Conversation
|
./tools/diff_coverage.sh ../loki-main/test_results.txt test_results.txt ingester,distributor,querier,querier/queryrange,iter,storage,chunkenc,logql,loki Change in test coverage per package. Green indicates 0 or positive change, red indicates that test coverage for a package fell. + ingester 0%
+ distributor 0%
+ querier 0%
+ querier/queryrange 0%
+ iter 0%
+ storage 0%
+ chunkenc 0%
+ logql 0%
+ loki 0% |
pkg/util/cfg/files.go
Outdated
| return YAML(val, expandEnv)(dst) | ||
| } | ||
| } | ||
| return fmt.Errorf("%s does not exist", f.Value.String()) |
There was a problem hiding this comment.
| return fmt.Errorf("%s does not exist", f.Value.String()) | |
| return fmt.Errorf("%s config does not exist, set %s for custom config path", f.Value.String(), name) |
There was a problem hiding this comment.
Added this suggestion because, currently it just prints
config.yaml does not exist if expected config file not found. Better to give some context where this is coming from and how to change it.
There was a problem hiding this comment.
I think this is pretty reasonable, but want to let others dissent before we merge (cc @cyriltovena @slim-bean). Also, can we add some docs describing the new behavior?
|
I think having a default location for the config file makes sense |
e627945 to
73594d8
Compare
|
./tools/diff_coverage.sh ../loki-main/test_results.txt test_results.txt ingester,distributor,querier,querier/queryrange,iter,storage,chunkenc,logql,loki Change in test coverage per package. Green indicates 0 or positive change, red indicates that test coverage for a package fell. + ingester 0%
+ distributor 0%
+ querier 0%
+ querier/queryrange 0%
+ iter 0%
+ storage 0%
+ chunkenc 0%
+ logql 0%
+ loki 0% |
1 similar comment
|
./tools/diff_coverage.sh ../loki-main/test_results.txt test_results.txt ingester,distributor,querier,querier/queryrange,iter,storage,chunkenc,logql,loki Change in test coverage per package. Green indicates 0 or positive change, red indicates that test coverage for a package fell. + ingester 0%
+ distributor 0%
+ querier 0%
+ querier/queryrange 0%
+ iter 0%
+ storage 0%
+ chunkenc 0%
+ logql 0%
+ loki 0% |
There was a problem hiding this comment.
Nice addition :). Would wait what @slim-bean think before merging it though.
de0a69f to
ff442d1
Compare
This change makes Loki look for a config file in the current directory or in the config/ sub-directory. This is a pre-requisite for making an easy-to-use tarball distribution that also ships a config.yaml Signed-off-by: Christian Haudum <christian.haudum@gmail.com>
The `YAMLFlag` function is solely used for loading config files. Signed-off-by: Christian Haudum <christian.haudum@gmail.com>
Signed-off-by: Christian Haudum <christian.haudum@gmail.com>
…ectories Signed-off-by: Christian Haudum <christian.haudum@gmail.com>
ff442d1 to
d64dac0
Compare
|
./tools/diff_coverage.sh ../loki-main/test_results.txt test_results.txt ingester,distributor,querier,querier/queryrange,iter,storage,chunkenc,logql,loki Change in test coverage per package. Green indicates 0 or positive change, red indicates that test coverage for a package fell. + ingester 0%
+ distributor 0%
+ querier 0%
+ querier/queryrange 0%
+ iter 0%
+ storage 0%
+ chunkenc 0%
+ logql 0%
+ loki 0% |
What this PR does / why we need it:
This change allows to start Loki without
-config.fileargument, by making it optional and by default look up the config file in the current directory or in a config/ sub-directory.This makes first use of Loki even simpler, especially when we distribute a tarball/zip that contains both the binary and a config file for use with local filesystem. Then Loki can be invoked simply with
./bin/lokiwithin the extracted folder.Pr-requisite for #6159
Which issue(s) this PR fixes:
Fixes #
Special notes for your reviewer:
Checklist
CHANGELOG.md.docs/sources/upgrading/_index.md