Skip to content

Commit

Permalink
objstore: Expose S3 region attribute (#1060)
Browse files Browse the repository at this point in the history
Minio is able to autodetect the region for cloud providers like AWS but the logic fails with Scaleway Object Storage solution.

Related issue on Minio: minio/mc#2570
  • Loading branch information
julien-sobczak authored and bwplotka committed Apr 23, 2019

Verified

This commit was signed with the committer’s verified signature.
renovate-bot Mend Renovate
1 parent da70cb0 commit 8eaebdf
Showing 3 changed files with 7 additions and 3 deletions.
4 changes: 3 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -11,12 +11,14 @@ We use *breaking* word for marking changes that are not backward compatible (rel

## Unreleased

### Added

- [#1060](https://github.com/improbable-eng/thanos/pull/1060) Allow specifying region attribute in S3 storage configuration

### Fixed

- [#1070](https://github.com/improbable-eng/thanos/pull/1070) Downsampling works back again. Deferred closer errors are now properly captured.


## [v0.4.0-rc.0](https://github.com/improbable-eng/thanos/releases/tag/v0.4.0-rc.0) - 2019.04.18

:warning: **IMPORTANT** :warning: This is the last release that supports gossip. From Thanos v0.5.0, gossip will be completely removed.
3 changes: 2 additions & 1 deletion docs/storage.md
Original file line number Diff line number Diff line change
@@ -49,6 +49,7 @@ type: S3
config:
bucket: ""
endpoint: ""
region: ""
access_key: ""
insecure: false
signature_version2: false
@@ -62,7 +63,7 @@ config:
enable: false
```
AWS region to endpoint mapping can be found in this [link](https://docs.aws.amazon.com/general/latest/gr/rande.html#s3_region)
The attribute `region` is optional. AWS region to endpoint mapping can be found in this [link](https://docs.aws.amazon.com/general/latest/gr/rande.html#s3_region).

Make sure you use a correct signature version.
Currently AWS require signature v4, so it needs `signature-version2: false`, otherwise, you will get Access Denied error, but several other S3 compatible use `signature-version2: true`
3 changes: 2 additions & 1 deletion pkg/objstore/s3/s3.go
Original file line number Diff line number Diff line change
@@ -37,6 +37,7 @@ const DirDelim = "/"
type Config struct {
Bucket string `yaml:"bucket"`
Endpoint string `yaml:"endpoint"`
Region string `yaml:"region"`
AccessKey string `yaml:"access_key"`
Insecure bool `yaml:"insecure"`
SignatureV2 bool `yaml:"signature_version2"`
@@ -122,7 +123,7 @@ func NewBucketWithConfig(logger log.Logger, config Config, component string) (*B
}
}

client, err := minio.NewWithCredentials(config.Endpoint, credentials.NewChainCredentials(chain), !config.Insecure, "")
client, err := minio.NewWithCredentials(config.Endpoint, credentials.NewChainCredentials(chain), !config.Insecure, config.Region)
if err != nil {
return nil, errors.Wrap(err, "initialize s3 client")
}

0 comments on commit 8eaebdf

Please sign in to comment.