sync with Cortex for s3 path style url

grafana · Jul 1, 2019 · ce98030 · ce98030
1 parent 4c71382
commit ce98030
Show file tree

Hide file tree

Showing 13 changed files with 164 additions and 149 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/docs/operations.md b/docs/operations.md
@@ -168,6 +168,16 @@ will stored in `s3://BUCKET_NAME/faker/`.
 
 The S3 configuration is setup with url format: `s3://access_key:secret_access_key@region/bucket_name`.
 
+For custom S3 endpoint (like Ceph Object Storage with S3 Compatible API), if it's using path-style url rather than 
+virtual hosted bucket addressing, please set config like below: 
+
+```yaml
+storage_config:
+  aws:
+    s3: s3://access_key:secret_access_key@custom_endpoint/bucket_name
+    s3forcepathstyle: true
+```
+
 #### DynamoDB
 
 Loki uses DynamoDB for the index storage. It is used for querying logs, make

diff --git a/vendor/github.com/cortexproject/cortex/pkg/chunk/aws/dynamodb_storage_client.go b/vendor/github.com/cortexproject/cortex/pkg/chunk/aws/dynamodb_storage_client.go
diff --git a/vendor/github.com/cortexproject/cortex/pkg/chunk/aws/s3_storage_client.go b/vendor/github.com/cortexproject/cortex/pkg/chunk/aws/s3_storage_client.go
diff --git a/vendor/github.com/cortexproject/cortex/pkg/chunk/encoding/bigchunk.go b/vendor/github.com/cortexproject/cortex/pkg/chunk/encoding/bigchunk.go
diff --git a/vendor/github.com/cortexproject/cortex/pkg/chunk/local/boltdb_index_client.go b/vendor/github.com/cortexproject/cortex/pkg/chunk/local/boltdb_index_client.go
diff --git a/vendor/github.com/cortexproject/cortex/pkg/chunk/schema.go b/vendor/github.com/cortexproject/cortex/pkg/chunk/schema.go
diff --git a/vendor/github.com/cortexproject/cortex/pkg/chunk/series_store.go b/vendor/github.com/cortexproject/cortex/pkg/chunk/series_store.go
diff --git a/vendor/github.com/cortexproject/cortex/pkg/chunk/storage/caching_index_client.pb.go b/vendor/github.com/cortexproject/cortex/pkg/chunk/storage/caching_index_client.pb.go