From 4039e5edbc11a745856d33ed752e84ff28e441fe Mon Sep 17 00:00:00 2001 From: Aaron Roydhouse Date: Tue, 21 Feb 2017 04:09:50 -0500 Subject: [PATCH] Improve 'external_image_storage.s3' documentation (#7623) Add documentation for 'external_image_storage.s3' to explain how to specify the AWS region for the S3 bucket, and the requires S3/IAM permissions. --- docs/sources/installation/configuration.md | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/docs/sources/installation/configuration.md b/docs/sources/installation/configuration.md index 6805188be05..4a2b60cb48d 100644 --- a/docs/sources/installation/configuration.md +++ b/docs/sources/installation/configuration.md @@ -602,13 +602,18 @@ You can choose between (s3, webdav). If left empty Grafana will ignore the uploa ## [external_image_storage.s3] ### bucket_url -bucket url for s3. ex http://grafana.s3.amazonaws.com/ +Bucket URL for S3. AWS region can be specified within URL or defaults to 'us-east-1', e.g. +- http://grafana.s3.amazonaws.com/ +- https://grafana.s3-ap-southeast-2.amazonaws.com/ +- https://grafana.s3-cn-north-1.amazonaws.com.cn ### access_key -access key. ex AAAAAAAAAAAAAAAAAAAA +Access key. e.g. AAAAAAAAAAAAAAAAAAAA + +Access key requires permissions to the S3 bucket for the 's3:PutObject' and 's3:PutObjectAcl' actions. ### secret_key -secret key. ex AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +Secret key. e.g. AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA ## [external_image_storage.webdav]