From 0b8b60a17a2d3298008dd3320e268aad09efda9e Mon Sep 17 00:00:00 2001 From: Xiang Dai Date: Thu, 12 Dec 2019 11:03:52 +0800 Subject: [PATCH] Clean up white noise and format all codes Signed-off-by: Xiang Dai --- docs/components/compact.md | 2 +- docs/quick-tutorial.md | 2 +- docs/service-discovery.md | 2 +- pkg/objstore/oss/oss.go | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/components/compact.md b/docs/components/compact.md index 30e536ed37f..070d82b7b00 100644 --- a/docs/components/compact.md +++ b/docs/components/compact.md @@ -9,7 +9,7 @@ menu: components The compactor component of Thanos applies the compaction procedure of the Prometheus 2.0 storage engine to block data stored in object storage. It is generally not semantically concurrency safe and must be deployed as a singleton against a bucket. -It is also responsible for downsampling of data: +It is also responsible for downsampling of data: * creating 5m downsampling for blocks larger than **40 hours** (2d, 2w) * creating 1h downsampling for blocks larger than **10 days** (2w). diff --git a/docs/quick-tutorial.md b/docs/quick-tutorial.md index 9ed77ac59b2..78a12d786f6 100644 --- a/docs/quick-tutorial.md +++ b/docs/quick-tutorial.md @@ -95,7 +95,7 @@ thanos sidecar \ ### Uploading old metrics. -When sidecar is run with the `--shipper.upload-compacted` flag it will sync all older existing blocks from the Prometheus local storage on startup. +When sidecar is run with the `--shipper.upload-compacted` flag it will sync all older existing blocks from the Prometheus local storage on startup. NOTE: This assumes you never run sidecar with block uploading against this bucket. Otherwise manual steps are needed to remove overlapping blocks from the bucket. Those will be suggested by the sidecar verification process. diff --git a/docs/service-discovery.md b/docs/service-discovery.md index 23bd3ca899f..cdb44e84930 100644 --- a/docs/service-discovery.md +++ b/docs/service-discovery.md @@ -13,7 +13,7 @@ SD is currently used in the following places within Thanos: * `Thanos Query` needs to know about [StoreAPI](https://github.com/thanos-io/thanos/blob/d3fb337da94d11c78151504b1fccb1d7e036f394/pkg/store/storepb/rpc.proto#L14) servers in order to query metrics from them. * `Thanos Rule` needs to know about `QueryAPI` servers in order to evaluate recording and alerting rules. -* `Thanos Rule` needs to know about `Alertmanagers` HA replicas in order to send alerts; only static option with DNS discovery. +* `Thanos Rule` needs to know about `Alertmanagers` HA replicas in order to send alerts; only static option with DNS discovery. There are currently several ways to configure SD, described below in more detail: diff --git a/pkg/objstore/oss/oss.go b/pkg/objstore/oss/oss.go index e4b2b142248..ff5ab1831fc 100644 --- a/pkg/objstore/oss/oss.go +++ b/pkg/objstore/oss/oss.go @@ -139,7 +139,7 @@ func (b *Bucket) Delete(ctx context.Context, name string) error { // ObjectSize returns the size of the specified object. func (b *Bucket) ObjectSize(ctx context.Context, name string) (uint64, error) { - // https://github.com/aliyun/aliyun-oss-go-sdk/blob/cee409f5b4d75d7ad077cacb7e6f4590a7f2e172/oss/bucket.go#L668 + // refer to https://github.com/aliyun/aliyun-oss-go-sdk/blob/cee409f5b4d75d7ad077cacb7e6f4590a7f2e172/oss/bucket.go#L668. m, err := b.bucket.GetObjectMeta(name) if err != nil { return 0, err