Skip to content

Commit

Permalink
fix docs (#1683)
Browse files Browse the repository at this point in the history
Signed-off-by: wujinhu <[email protected]>
Signed-off-by: Giedrius Statkevičius <[email protected]>
  • Loading branch information
wujinhu authored and GiedriusS committed Oct 28, 2019
1 parent 42a6a21 commit 41fea9b
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ We use *breaking* word for marking changes that are not backward compatible (rel
### Added

- [#1660](https://github.com/thanos-io/thanos/pull/1660) Add a new `--prometheus.ready_timeout` CLI option to the sidecar to set how long to wait until Prometheus starts up.
- [#1573](https://github.com/thanos-io/thanos/pull/1573) `AliYun OSS` object storage, see [documents](docs/storage.md#aliyun-oss-configuration) for further information.
- [#1573](https://github.com/thanos-io/thanos/pull/1573) `AliYun OSS` object storage, see [documents](docs/storage.md#aliyun-oss) for further information.
- [#1680](https://github.com/thanos-io/thanos/pull/1680) Add a new `--http-grace-period` CLI option to components which serve HTTP to set how long to wait until HTTP Server shuts down.

### Fixed
Expand Down
2 changes: 1 addition & 1 deletion docs/storage.md
Original file line number Diff line number Diff line change
Expand Up @@ -338,7 +338,7 @@ config:

Set the flags `--objstore.config-file` to reference to the configuration file.

## AliYun OSS Configuration
## AliYun OSS
In order to use AliYun OSS object storage, you should first create a bucket with proper Storage Class , ACLs and get the access key on the AliYun cloud. Go to [https://www.alibabacloud.com/product/oss](https://www.alibabacloud.com/product/oss) for more detail.

To use AliYun OSS object storage, please specify following yaml configuration file in `objstore.config*` flag.
Expand Down

0 comments on commit 41fea9b

Please sign in to comment.