From e6918d5a5a54e2508d5e48ccc7ce9ca54765471e Mon Sep 17 00:00:00 2001 From: Rita Canavarro <98762287+ritaCanavarro@users.noreply.github.com> Date: Wed, 13 Sep 2023 17:28:25 +0100 Subject: [PATCH] Add Shipper bytes uploaded metric #6438 (#6544) * [FEAT] Add uploaded bytes metric Signed-off-by: rita.canavarro * [FEAT] Add PR number to log Signed-off-by: rita.canavarro * [FIX] Log msg Signed-off-by: rita.canavarro * [FEAT] Clean code Signed-off-by: rita.canavarro * [FIX] Remove shadow code Signed-off-by: rita.canavarro * [FIX] Go format Signed-off-by: rita.canavarro * [FEAT] Update objstore Signed-off-by: rita.canavarro * [FEAT] Update objstore package Signed-off-by: rita.canavarro * [FEAT] Update storage.md Signed-off-by: rita.canavarro * [FEAT] Update erroring bucket Signed-off-by: rita.canavarro * [FEAT] Update erroring bucket Signed-off-by: rita.canavarro --------- Signed-off-by: rita.canavarro --- CHANGELOG.md | 1 + cmd/thanos/main_test.go | 6 +++--- docs/storage.md | 1 + go.mod | 2 +- go.sum | 4 ++-- 5 files changed, 8 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cf6339fb8b..8c92aab1af 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -302,6 +302,7 @@ NOTE: Querier's `query.promql-engine` flag enabling new PromQL engine is now unh - [#5741](https://github.com/thanos-io/thanos/pull/5741) Query: add metrics on how much data is being selected by downstream Store APIs. - [#5673](https://github.com/thanos-io/thanos/pull/5673) Receive: Reload tenant limit configuration on file change. - [#5749](https://github.com/thanos-io/thanos/pull/5749) Query Frontend: Added small LRU cache to cache query analysis results. +- [#6544](https://github.com/thanos-io/thanos/pull/6500) Objstore: Update objstore to latest version which adds a new metric regarding uploaded TSDB bytes ### Changed diff --git a/cmd/thanos/main_test.go b/cmd/thanos/main_test.go index 7feca6162b..3d6a9ee85f 100644 --- a/cmd/thanos/main_test.go +++ b/cmd/thanos/main_test.go @@ -77,9 +77,9 @@ func (b *erroringBucket) IsObjNotFoundErr(err error) bool { return b.bkt.IsObjNotFoundErr(err) } -// IsCustomerManagedKeyError returns true if error means that customer managed key is invalid. -func (b *erroringBucket) IsCustomerManagedKeyError(err error) bool { - return b.bkt.IsCustomerManagedKeyError(err) +// IsAccessDeniedErr returns true if error means that access to the object was denied. +func (b *erroringBucket) IsAccessDeniedErr(err error) bool { + return b.bkt.IsAccessDeniedErr(err) } // Attributes returns information about the specified object. diff --git a/docs/storage.md b/docs/storage.md index 24634ad3c7..f1f331cb40 100644 --- a/docs/storage.md +++ b/docs/storage.md @@ -357,6 +357,7 @@ type: AZURE config: storage_account: "" storage_account_key: "" + storage_connection_string: "" container: "" endpoint: "" user_assigned_id: "" diff --git a/go.mod b/go.mod index 7843a69f4c..be47d64ae0 100644 --- a/go.mod +++ b/go.mod @@ -65,7 +65,7 @@ require ( github.com/prometheus/prometheus v0.46.1-0.20230818184859-4d8e380269da github.com/sony/gobreaker v0.5.0 github.com/stretchr/testify v1.8.4 - github.com/thanos-io/objstore v0.0.0-20230804084840-c042a6a16c58 + github.com/thanos-io/objstore v0.0.0-20230908084555-8d397d4d88e7 github.com/thanos-io/promql-engine v0.0.0-20230821193351-e1ae4275b96e github.com/uber/jaeger-client-go v2.30.0+incompatible github.com/uber/jaeger-lib v2.4.1+incompatible // indirect diff --git a/go.sum b/go.sum index 54398c806f..2044edb79a 100644 --- a/go.sum +++ b/go.sum @@ -906,8 +906,8 @@ github.com/tencentyun/cos-go-sdk-v5 v0.7.40 h1:W6vDGKCHe4wBACI1d2UgE6+50sJFhRWU4 github.com/tencentyun/cos-go-sdk-v5 v0.7.40/go.mod h1:4dCEtLHGh8QPxHEkgq+nFaky7yZxQuYwgSJM87icDaw= github.com/thanos-community/galaxycache v0.0.0-20211122094458-3a32041a1f1e h1:f1Zsv7OAU9iQhZwigp50Yl38W10g/vd5NC8Rdk1Jzng= github.com/thanos-community/galaxycache v0.0.0-20211122094458-3a32041a1f1e/go.mod h1:jXcofnrSln/cLI6/dhlBxPQZEEQHVPCcFaH75M+nSzM= -github.com/thanos-io/objstore v0.0.0-20230804084840-c042a6a16c58 h1:4cDXsvm3mb1NvW1B1qJ9/fy6h+OOYit0h8oVA957hLM= -github.com/thanos-io/objstore v0.0.0-20230804084840-c042a6a16c58/go.mod h1:oJ82xgcBDzGJrEgUsjlTj6n01+ZWUMMUR8BlZzX5xDE= +github.com/thanos-io/objstore v0.0.0-20230908084555-8d397d4d88e7 h1:P1mukL6u3wKv4gRLjhnEYltZf8k5dXkE7y7UvEJo0fU= +github.com/thanos-io/objstore v0.0.0-20230908084555-8d397d4d88e7/go.mod h1:oJ82xgcBDzGJrEgUsjlTj6n01+ZWUMMUR8BlZzX5xDE= github.com/thanos-io/promql-engine v0.0.0-20230821193351-e1ae4275b96e h1:kwsFCU8eSkZehbrAN3nXPw5RdMHi/Bok/y8l2C4M+gk= github.com/thanos-io/promql-engine v0.0.0-20230821193351-e1ae4275b96e/go.mod h1:+T/ZYNCGybT6eTsGGvVtGb63nT1cvUmH6MjqRrcQoKw= github.com/themihai/gomemcache v0.0.0-20180902122335-24332e2d58ab h1:7ZR3hmisBWw77ZpO1/o86g+JV3VKlk3d48jopJxzTjU=