Configuration: add a common config section for object storage #4473
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
trevorwhitney
commented
Oct 14, 2021
| @@ -125,6 +126,32 @@ func (cfg *S3Config) Validate() error { | |||
| return nil | |||
| } | |||
|
|
|||
| func (cfg *S3Config) ToCortexS3Config() cortex_aws.S3Config { | |||
There was a problem hiding this comment.
These "translation" functions are unfortunate, and warrant a discussion around the best path for extracting/sharing object storage clients between various projects. Out of scope for this PR though I think.
trevorwhitney
force-pushed
the
common-object-store
branch
from
49d06a3
to
fe912bb
Compare
DylanGuedes
reviewed
Oct 14, 2021
2 tasks
DylanGuedes
reviewed
Oct 18, 2021
owen-d
approved these changes
Oct 18, 2021
pkg/loki/common/common.go
Outdated
| S3 *aws.S3Config `yaml:"s3"` | ||
| GCS *gcp.GCSConfig `yaml:"gcs"` | ||
| Azure *azure.BlobStorageConfig `yaml:"azure"` | ||
| Swift *openstack.SwiftConfig `yaml:"swift"` |
There was a problem hiding this comment.
Any thoughts on adding filesystem in here and calling the struct storage instead of object_storage?
There was a problem hiding this comment.
yup, I agree with that. done.
|
@owen-d and @DylanGuedes changes pushed if you want to take another look. thanks! |
Signed-off-by: Trevor Whitney <trevorjwhitney@gmail.com>
Signed-off-by: Trevor Whitney <trevorjwhitney@gmail.com>
Signed-off-by: Trevor Whitney <trevorjwhitney@gmail.com>
trevorwhitney
force-pushed
the
common-object-store
branch
from
5154688
to
c925bad
Compare
|
LGTM! |
DylanGuedes
approved these changes
Oct 20, 2021
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.
Signed-off-by: Trevor Whitney trevorjwhitney@gmail.com
What this PR does / why we need it:
This adds an
object_storagesection to the common config that will do the following things:ruler.storageconfig is provided in the config filestorage_configis provided in the config filecompactor.shared_storeunless a specific configuration is provided in the config fileThe common config block only allows a single object storage configuration to be provided, and will error if multiple configurations are provided (ie. s3 and azure). This allows us to determine the correct value for
ruler.storage.typeandcompactor.shared_store. Loki supports configuring multiple client types for chunk storage in thestorage_configsection, allowing different clients to be used for different schemas. If a user desires this behavior, they will need to provide the multiple different configurations in thestorage_configsection themselves.Which issue(s) this PR fixes:
Fixes #4472
Special notes for your reviewer:
Checklist