From 9bbcaa3ae329a5c5abb861d619f03e801f155363 Mon Sep 17 00:00:00 2001 From: Michael Hoffmann Date: Thu, 26 Oct 2023 06:00:13 +0200 Subject: [PATCH 1/7] Cut 0.33.0-rc.0 (#6841) Signed-off-by: Michael Hoffmann --- CHANGELOG.md | 11 ++++++++ VERSION | 2 +- docs/release-process.md | 62 ++++++++++++++++++++--------------------- 3 files changed, 43 insertions(+), 32 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 81742d97ad..c0bffb5c44 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,17 @@ We use *breaking :warning:* to mark changes that are not backward compatible (re ## Unreleased ### Fixed + +### Added + +### Changed + +### Removed + +## [v0.33.0](https://github.com/thanos-io/thanos/tree/release-0.33) - in progress + +### Fixed + - [#6817](https://github.com/thanos-io/thanos/pull/6817) Store Gateway: fix `matchersToPostingGroups` label values variable got shadowed bug. ### Added diff --git a/VERSION b/VERSION index 6eb78516dd..be386c9ede 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.33.0-dev +0.33.0 diff --git a/docs/release-process.md b/docs/release-process.md index 75efb7ceb3..5ea9080378 100644 --- a/docs/release-process.md +++ b/docs/release-process.md @@ -21,37 +21,37 @@ Release shepherd responsibilities: * Perform releases (from first RC to actual release). * Announce all releases on all communication channels. -| Release | Time of first RC | Shepherd (GitHub handle) | -|---------|----------------------|-------------------------------| -| v0.33.0 | (planned) 2023.10.03 | TBD | -| v0.32.0 | 2023.08.23 | `@saswatamcode` | -| v0.31.0 | 2023.03.23 | `@fpetkovski` | -| v0.30.0 | 2022.12.21 | `@bwplotka` | -| v0.29.0 | 2022.10.21 | `@GiedriusS` | -| v0.28.0 | 2022.08.22 | `@yeya24` | -| v0.27.0 | 2022.06.21 | `@wiardvanrij` and `@matej-g` | -| v0.26.0 | 2022.04.29 | `@wiardvanrij` | -| v0.25.0 | 2022.03.01 | `@bwplotka` and `@matej-g` | -| v0.24.0 | 2021.12.22 | `@squat` | -| v0.23.0 | 2021.09.02 | `@bwplotka` | -| v0.22.0 | 2021.07.06 | `@GiedriusS` | -| v0.21.0 | 2021.05.28 | `@metalmatze` and `@onprem` | -| v0.20.0 | 2021.04.23 | `@kakkoyun` | -| v0.19.0 | 2021.03.02 | `@bwplotka` | -| v0.18.0 | 2021.01.06 | `@squat` | -| v0.17.0 | 2020.11.18 | `@metalmatze` | -| v0.16.0 | 2020.10.26 | `@bwplotka` | -| v0.15.0 | 2020.08.12 | `@kakkoyun` | -| v0.14.0 | 2020.07.10 | `@kakkoyun` | -| v0.13.0 | 2020.05.13 | `@bwplotka` | -| v0.12.0 | 2020.04.15 | `@squat` | -| v0.11.0 | 2020.02.19 | `@metalmatze` | -| v0.10.0 | 2020.01.08 | `@GiedriusS` | -| v0.9.0 | 2019.11.26 | `@bwplotka` | -| v0.8.0 | 2019.10.09 | `@bwplotka` | -| v0.7.0 | 2019.08.28 | `@domgreen` | -| v0.6.0 | 2019.07.12 | `@GiedriusS` | -| v0.5.0 | 2019.06.31 | `@bwplotka` | +| Release | Time of first RC | Shepherd (GitHub handle) | +|---------|------------------|-------------------------------| +| v0.33.0 | 2023.10.24 | `@MichaHoffmann` | +| v0.32.0 | 2023.08.23 | `@saswatamcode` | +| v0.31.0 | 2023.03.23 | `@fpetkovski` | +| v0.30.0 | 2022.12.21 | `@bwplotka` | +| v0.29.0 | 2022.10.21 | `@GiedriusS` | +| v0.28.0 | 2022.08.22 | `@yeya24` | +| v0.27.0 | 2022.06.21 | `@wiardvanrij` and `@matej-g` | +| v0.26.0 | 2022.04.29 | `@wiardvanrij` | +| v0.25.0 | 2022.03.01 | `@bwplotka` and `@matej-g` | +| v0.24.0 | 2021.12.22 | `@squat` | +| v0.23.0 | 2021.09.02 | `@bwplotka` | +| v0.22.0 | 2021.07.06 | `@GiedriusS` | +| v0.21.0 | 2021.05.28 | `@metalmatze` and `@onprem` | +| v0.20.0 | 2021.04.23 | `@kakkoyun` | +| v0.19.0 | 2021.03.02 | `@bwplotka` | +| v0.18.0 | 2021.01.06 | `@squat` | +| v0.17.0 | 2020.11.18 | `@metalmatze` | +| v0.16.0 | 2020.10.26 | `@bwplotka` | +| v0.15.0 | 2020.08.12 | `@kakkoyun` | +| v0.14.0 | 2020.07.10 | `@kakkoyun` | +| v0.13.0 | 2020.05.13 | `@bwplotka` | +| v0.12.0 | 2020.04.15 | `@squat` | +| v0.11.0 | 2020.02.19 | `@metalmatze` | +| v0.10.0 | 2020.01.08 | `@GiedriusS` | +| v0.9.0 | 2019.11.26 | `@bwplotka` | +| v0.8.0 | 2019.10.09 | `@bwplotka` | +| v0.7.0 | 2019.08.28 | `@domgreen` | +| v0.6.0 | 2019.07.12 | `@GiedriusS` | +| v0.5.0 | 2019.06.31 | `@bwplotka` | # For maintainers: Cutting individual release From 18471640806b2f903baa0c0b33d21151e434c5a8 Mon Sep 17 00:00:00 2001 From: Daniel Mellado <1313475+danielmellado@users.noreply.github.com> Date: Fri, 3 Nov 2023 10:35:06 +0100 Subject: [PATCH 2/7] Bump go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp from (#6864) 0.42.0 to 0.44.0 Signed-off-by: Daniel Mellado --- go.mod | 21 ++++++++++----------- go.sum | 38 ++++++++++++++++++-------------------- 2 files changed, 28 insertions(+), 31 deletions(-) diff --git a/go.mod b/go.mod index 594cd579a0..7c94f9a4f2 100644 --- a/go.mod +++ b/go.mod @@ -73,14 +73,14 @@ require ( github.com/weaveworks/common v0.0.0-20221201103051-7c2720a9024d go.elastic.co/apm v1.11.0 go.elastic.co/apm/module/apmot v1.11.0 - go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.42.0 // indirect - go.opentelemetry.io/otel v1.16.0 - go.opentelemetry.io/otel/bridge/opentracing v1.16.0 - go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.16.0 - go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.16.0 - go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.16.0 - go.opentelemetry.io/otel/sdk v1.16.0 - go.opentelemetry.io/otel/trace v1.16.0 + go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.44.0 // indirect + go.opentelemetry.io/otel v1.19.0 + go.opentelemetry.io/otel/bridge/opentracing v1.19.0 + go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.19.0 + go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.19.0 + go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.19.0 + go.opentelemetry.io/otel/sdk v1.19.0 + go.opentelemetry.io/otel/trace v1.19.0 go.uber.org/atomic v1.11.0 go.uber.org/automaxprocs v1.5.2 go.uber.org/goleak v1.2.1 @@ -91,7 +91,7 @@ require ( golang.org/x/time v0.3.0 google.golang.org/api v0.132.0 // indirect google.golang.org/genproto v0.0.0-20230717213848-3f92550aa753 // indirect - google.golang.org/grpc v1.56.2 + google.golang.org/grpc v1.58.2 google.golang.org/grpc/examples v0.0.0-20211119005141-f45e61797429 gopkg.in/alecthomas/kingpin.v2 v2.2.6 gopkg.in/yaml.v2 v2.4.0 @@ -133,7 +133,6 @@ require ( go.opentelemetry.io/collector/pdata v1.0.0-rcv0014 // indirect go.opentelemetry.io/collector/semconv v0.81.0 // indirect go.opentelemetry.io/contrib/propagators/ot v1.13.0 // indirect - go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.16.0 // indirect go4.org/unsafe/assume-no-moving-gc v0.0.0-20230525183740-e7c30c78aeb2 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20230717213848-3f92550aa753 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20230717213848-3f92550aa753 // indirect @@ -240,7 +239,7 @@ require ( go.opentelemetry.io/contrib/propagators/aws v1.13.0 // indirect go.opentelemetry.io/contrib/propagators/b3 v1.13.0 // indirect go.opentelemetry.io/contrib/propagators/jaeger v1.13.0 // indirect - go.opentelemetry.io/otel/metric v1.16.0 // indirect + go.opentelemetry.io/otel/metric v1.19.0 // indirect go.opentelemetry.io/proto/otlp v1.0.0 // indirect go.uber.org/multierr v1.11.0 // indirect golang.org/x/mod v0.12.0 // indirect diff --git a/go.sum b/go.sum index b90a294b96..3a45238946 100644 --- a/go.sum +++ b/go.sum @@ -1049,8 +1049,8 @@ go.opentelemetry.io/collector/pdata v1.0.0-rcv0014 h1:iT5qH0NLmkGeIdDtnBogYDx7L5 go.opentelemetry.io/collector/pdata v1.0.0-rcv0014/go.mod h1:BRvDrx43kiSoUx3mr7SoA7h9B8+OY99mUK+CZSQFWW4= go.opentelemetry.io/collector/semconv v0.81.0 h1:lCYNNo3powDvFIaTPP2jDKIrBiV1T92NK4QgL/aHYXw= go.opentelemetry.io/collector/semconv v0.81.0/go.mod h1:TlYPtzvsXyHOgr5eATi43qEMqwSmIziivJB2uctKswo= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.42.0 h1:pginetY7+onl4qN1vl0xW/V/v6OBZ0vVdH+esuJgvmM= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.42.0/go.mod h1:XiYsayHc36K3EByOO6nbAXnAWbrUxdjUROCEeeROOH8= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.44.0 h1:KfYpVmrjI7JuToy5k8XV3nkapjWx48k4E4JOtVstzQI= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.44.0/go.mod h1:SeQhzAEccGVZVEy7aH87Nh0km+utSpo1pTv6eMMop48= go.opentelemetry.io/contrib/propagators/autoprop v0.38.0 h1:WZwiLCwOL0XW/6TVT7LTtdRDveoHZ6q3wL+0iYsBcdE= go.opentelemetry.io/contrib/propagators/autoprop v0.38.0/go.mod h1:JBebP2d0HiffbfelbIEoBOCl4790g7Z8lD1scUd3Vd8= go.opentelemetry.io/contrib/propagators/aws v1.13.0 h1:9qOAQhTeJGiaYNfCCnRmL12XZGIaxclqS5yfkSXpn8o= @@ -1063,26 +1063,24 @@ go.opentelemetry.io/contrib/propagators/ot v1.13.0 h1:tHWNd0WRS6w9keZoZg9aF3zYoh go.opentelemetry.io/contrib/propagators/ot v1.13.0/go.mod h1:R6Op9T6LxNaMRVlGD0wVwz40LSsAq296CXiEydKLQBU= go.opentelemetry.io/contrib/samplers/jaegerremote v0.7.0 h1:E+RlfFhGZ5Tk0wO1oOJYC0Il4Q7SjE8ZMl8x/VTK9Pk= go.opentelemetry.io/contrib/samplers/jaegerremote v0.7.0/go.mod h1:cuBMmL+iGJ4UpZi6dykQlIUxqKSMkp5eu1C1UjUJYFI= -go.opentelemetry.io/otel v1.16.0 h1:Z7GVAX/UkAXPKsy94IU+i6thsQS4nb7LviLpnaNeW8s= -go.opentelemetry.io/otel v1.16.0/go.mod h1:vl0h9NUa1D5s1nv3A5vZOYWn8av4K8Ml6JDeHrT/bx4= -go.opentelemetry.io/otel/bridge/opentracing v1.16.0 h1:Bgwi7P5NCV3bv2T13bwG0WfsxaT4SjQ1rDdmFc5P7do= -go.opentelemetry.io/otel/bridge/opentracing v1.16.0/go.mod h1:X2Y6v3RnoiBGtVFd4KoHy/ftHiCJKJXzlv6W2gPsN1Q= +go.opentelemetry.io/otel v1.19.0 h1:MuS/TNf4/j4IXsZuJegVzI1cwut7Qc00344rgH7p8bs= +go.opentelemetry.io/otel v1.19.0/go.mod h1:i0QyjOq3UPoTzff0PJB2N66fb4S0+rSbSB15/oyH9fY= +go.opentelemetry.io/otel/bridge/opentracing v1.19.0 h1:HCvsUi6uuhat/nAuxCl41A+OPxXXPxMNTRxKZx7hTW4= +go.opentelemetry.io/otel/bridge/opentracing v1.19.0/go.mod h1:n46h+7L/lcSuHhpqJQiUdb4eux19NNxTuWJ/ZMnIQMg= go.opentelemetry.io/otel/exporters/jaeger v1.16.0 h1:YhxxmXZ011C0aDZKoNw+juVWAmEfv/0W2XBOv9aHTaA= go.opentelemetry.io/otel/exporters/jaeger v1.16.0/go.mod h1:grYbBo/5afWlPpdPZYhyn78Bk04hnvxn2+hvxQhKIQM= -go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.16.0 h1:t4ZwRPU+emrcvM2e9DHd0Fsf0JTPVcbfa/BhTDF03d0= -go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.16.0/go.mod h1:vLarbg68dH2Wa77g71zmKQqlQ8+8Rq3GRG31uc0WcWI= -go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.16.0 h1:cbsD4cUcviQGXdw8+bo5x2wazq10SKz8hEbtCRPcU78= -go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.16.0/go.mod h1:JgXSGah17croqhJfhByOLVY719k1emAXC8MVhCIJlRs= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.16.0 h1:TVQp/bboR4mhZSav+MdgXB8FaRho1RC8UwVn3T0vjVc= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.16.0/go.mod h1:I33vtIe0sR96wfrUcilIzLoA3mLHhRmz9S9Te0S3gDo= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.16.0 h1:iqjq9LAB8aK++sKVcELezzn655JnBNdsDhghU4G/So8= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.16.0/go.mod h1:hGXzO5bhhSHZnKvrDaXB82Y9DRFour0Nz/KrBh7reWw= -go.opentelemetry.io/otel/metric v1.16.0 h1:RbrpwVG1Hfv85LgnZ7+txXioPDoh6EdbZHo26Q3hqOo= -go.opentelemetry.io/otel/metric v1.16.0/go.mod h1:QE47cpOmkwipPiefDwo2wDzwJrlfxxNYodqc4xnGCo4= -go.opentelemetry.io/otel/sdk v1.16.0 h1:Z1Ok1YsijYL0CSJpHt4cS3wDDh7p572grzNrBMiMWgE= -go.opentelemetry.io/otel/sdk v1.16.0/go.mod h1:tMsIuKXuuIWPBAOrH+eHtvhTL+SntFtXF9QD68aP6p4= -go.opentelemetry.io/otel/trace v1.16.0 h1:8JRpaObFoW0pxuVPapkgH8UhHQj+bJW8jJsCZEu5MQs= -go.opentelemetry.io/otel/trace v1.16.0/go.mod h1:Yt9vYq1SdNz3xdjZZK7wcXv1qv2pwLkqr2QVwea0ef0= +go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.19.0 h1:Mne5On7VWdx7omSrSSZvM4Kw7cS7NQkOOmLcgscI51U= +go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.19.0/go.mod h1:IPtUMKL4O3tH5y+iXVyAXqpAwMuzC1IrxVS81rummfE= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.19.0 h1:3d+S281UTjM+AbF31XSOYn1qXn3BgIdWl8HNEpx08Jk= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.19.0/go.mod h1:0+KuTDyKL4gjKCF75pHOX4wuzYDUZYfAQdSu43o+Z2I= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.19.0 h1:IeMeyr1aBvBiPVYihXIaeIZba6b8E1bYp7lbdxK8CQg= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.19.0/go.mod h1:oVdCUtjq9MK9BlS7TtucsQwUcXcymNiEDjgDD2jMtZU= +go.opentelemetry.io/otel/metric v1.19.0 h1:aTzpGtV0ar9wlV4Sna9sdJyII5jTVJEvKETPiOKwvpE= +go.opentelemetry.io/otel/metric v1.19.0/go.mod h1:L5rUsV9kM1IxCj1MmSdS+JQAcVm319EUrDVLrt7jqt8= +go.opentelemetry.io/otel/sdk v1.19.0 h1:6USY6zH+L8uMH8L3t1enZPR3WFEmSTADlqldyHtJi3o= +go.opentelemetry.io/otel/sdk v1.19.0/go.mod h1:NedEbbS4w3C6zElbLdPJKOpJQOrGUJ+GfzpjUvI0v1A= +go.opentelemetry.io/otel/trace v1.19.0 h1:DFVQmlVbfVeOuBRrwdtaehRrWiL1JoVs9CPIQ1Dzxpg= +go.opentelemetry.io/otel/trace v1.19.0/go.mod h1:mfaSyvGyEJEI0nyV2I4qhNQnbBOUUmYZpYojqMnX2vo= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.opentelemetry.io/proto/otlp v1.0.0 h1:T0TX0tmXU8a3CbNXzEKGeU5mIVOdf0oykP+u2lIVU/I= go.opentelemetry.io/proto/otlp v1.0.0/go.mod h1:Sy6pihPLfYHkr3NkUbEhGHFhINUSI/v80hjKIs5JXpM= From 6a62cbe1fd94265bc2692cbf38da098e256015df Mon Sep 17 00:00:00 2001 From: Michael Hoffmann Date: Tue, 7 Nov 2023 18:50:10 +0100 Subject: [PATCH 3/7] Cut Release 0.33.0-rc.0 (#6857) * *: mark as 0.33-rc.0 Signed-off-by: Michael Hoffmann * Bump go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp from (#6863) 0.42.0 to 0.44.0 Signed-off-by: Daniel Mellado Signed-off-by: Michael Hoffmann --------- Signed-off-by: Michael Hoffmann Signed-off-by: Daniel Mellado Co-authored-by: Daniel Mellado <1313475+danielmellado@users.noreply.github.com> --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index be386c9ede..42eb111047 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.33.0 +0.33.0-rc.0 From 053bd4a7de5db40eebf4cfa67566aa8393a689f3 Mon Sep 17 00:00:00 2001 From: Rikhil Shah <60136852+rikhil-s@users.noreply.github.com> Date: Wed, 15 Nov 2023 17:40:24 +0000 Subject: [PATCH 4/7] Objstore: Bump Objstore for Azure Workload Identity support (#6891) * Bump objstore for Azure Workload Identity support Signed-off-by: Rikhil Shah * make check-docs Signed-off-by: Rikhil Shah * Add changelog entry Signed-off-by: Rikhil Shah * Update Azure client docs Signed-off-by: Rikhil Shah * make check-docs Signed-off-by: Rikhil Shah * Move changelog entry to 0.33.0 release Signed-off-by: Rikhil Shah * Move changelog entry Signed-off-by: Rikhil Shah --------- Signed-off-by: Rikhil Shah Signed-off-by: Michael Hoffmann --- CHANGELOG.md | 2 +- docs/storage.md | 13 +++++++++++-- go.mod | 8 ++++---- go.sum | 16 ++++++++-------- 4 files changed, 24 insertions(+), 15 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c0bffb5c44..118abf0bf1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -25,7 +25,7 @@ We use *breaking :warning:* to mark changes that are not backward compatible (re - [#6817](https://github.com/thanos-io/thanos/pull/6817) Store Gateway: fix `matchersToPostingGroups` label values variable got shadowed bug. ### Added - +- [#6891](https://github.com/thanos-io/thanos/pull/6891) Objstore: Bump `objstore` which adds support for Azure Workload Identity. - [#6605](https://github.com/thanos-io/thanos/pull/6605) Query Frontend: Support vertical sharding binary expression with metric name when no matching labels specified. - [#6308](https://github.com/thanos-io/thanos/pull/6308) Ruler: Support configuration flag that allows customizing template for alert message. - [#6760](https://github.com/thanos-io/thanos/pull/6760) Query Frontend: Added TLS support in `--query-frontend.downstream-tripper-config` and `--query-frontend.downstream-tripper-config-file` diff --git a/docs/storage.md b/docs/storage.md index f1f331cb40..25cc1e7dfd 100644 --- a/docs/storage.md +++ b/docs/storage.md @@ -93,6 +93,7 @@ config: enable: false list_objects_version: "" bucket_lookup_type: auto + send_content_md5: true part_size: 67108864 sse_config: type: "" @@ -389,9 +390,17 @@ config: prefix: "" ``` -If `msi_resource` is used, authentication is done via system-assigned managed identity. The value for Azure should be `https://.blob.core.windows.net`. +If `storage_account_key` is used, authentication is done via storage account key. -If `user_assigned_id` is used, authentication is done via user-assigned managed identity. When using `user_assigned_id` the `msi_resource` defaults to `https://.` +If `user_assigned_id` is used, authentication is done via user-assigned managed identity. + +If `user_assigned_id` or `storage_account_key` is not passed, authentication is attempted with each of these credential types, in the following order, stopping when one provides a token: +- EnvironmentCredential +- WorkloadIdentityCredential +- ManagedIdentityCredential +- AzureCLICredential + +For the first three authentication types, the correct environment variables must be set for authentication to be successful. More information about the required environment variables for each authentication type can be found in the [Azure Identity Client Module for Go documentation](https://pkg.go.dev/github.com/Azure/azure-sdk-for-go/sdk/azidentity). The generic `max_retries` will be used as value for the `pipeline_config`'s `max_tries` and `reader_config`'s `max_retry_requests`. For more control, `max_retries` could be ignored (0) and one could set specific retry values. diff --git a/go.mod b/go.mod index 7c94f9a4f2..bcc0a7ce8f 100644 --- a/go.mod +++ b/go.mod @@ -65,7 +65,7 @@ require ( github.com/prometheus/prometheus v0.47.2-0.20231009162353-f6d9c84fde6b github.com/sony/gobreaker v0.5.0 github.com/stretchr/testify v1.8.4 - github.com/thanos-io/objstore v0.0.0-20230921130928-63a603e651ed + github.com/thanos-io/objstore v0.0.0-20231112185854-37752ee64d98 github.com/thanos-io/promql-engine v0.0.0-20231013104847-4517c0d5f591 github.com/uber/jaeger-client-go v2.30.0+incompatible github.com/uber/jaeger-lib v2.4.1+incompatible // indirect @@ -107,8 +107,8 @@ require ( cloud.google.com/go v0.110.4 // indirect cloud.google.com/go/compute v1.22.0 // indirect cloud.google.com/go/iam v1.1.1 // indirect - github.com/Azure/azure-sdk-for-go/sdk/azcore v1.7.1 // indirect - github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.3.1 // indirect + github.com/Azure/azure-sdk-for-go/sdk/azcore v1.8.0 // indirect + github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.4.0 // indirect github.com/Azure/azure-sdk-for-go/sdk/internal v1.3.0 // indirect github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v0.5.1 // indirect github.com/AzureAD/microsoft-authentication-library-for-go v1.1.1 // indirect @@ -191,7 +191,7 @@ require ( github.com/google/go-cmp v0.5.9 github.com/google/go-querystring v1.1.0 // indirect github.com/google/pprof v0.0.0-20230705174524-200ffdc848b8 // indirect - github.com/google/uuid v1.3.0 + github.com/google/uuid v1.3.1 github.com/googleapis/enterprise-certificate-proxy v0.2.5 // indirect github.com/googleapis/gax-go/v2 v2.12.0 // indirect github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect diff --git a/go.sum b/go.sum index 3a45238946..099ac6be2d 100644 --- a/go.sum +++ b/go.sum @@ -69,10 +69,10 @@ cloud.google.com/go/trace v1.10.1/go.mod h1:gbtL94KE5AJLH3y+WVpfWILmqgc6dXcqgNXd dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= github.com/Azure/azure-sdk-for-go v65.0.0+incompatible h1:HzKLt3kIwMm4KeJYTdx9EbjRYTySD/t8i1Ee/W5EGXw= github.com/Azure/azure-sdk-for-go v65.0.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= -github.com/Azure/azure-sdk-for-go/sdk/azcore v1.7.1 h1:/iHxaJhsFr0+xVFfbMr5vxz848jyiWuIEDhYq3y5odY= -github.com/Azure/azure-sdk-for-go/sdk/azcore v1.7.1/go.mod h1:bjGvMhVMb+EEm3VRNQawDMUyMMjo+S5ewNjflkep/0Q= -github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.3.1 h1:LNHhpdK7hzUcx/k1LIcuh5k7k1LGIWLQfCjaneSj7Fc= -github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.3.1/go.mod h1:uE9zaUfEQT/nbQjVi2IblCG9iaLtZsuYZ8ne+PuQ02M= +github.com/Azure/azure-sdk-for-go/sdk/azcore v1.8.0 h1:9kDVnTz3vbfweTqAUmk/a/pH5pWFCHtvRpHYC0G/dcA= +github.com/Azure/azure-sdk-for-go/sdk/azcore v1.8.0/go.mod h1:3Ug6Qzto9anB6mGlEdgYMDF5zHQ+wwhEaYR4s17PHMw= +github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.4.0 h1:BMAjVKJM0U/CYF27gA0ZMmXGkOcvfFtD0oHVZ1TIPRI= +github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.4.0/go.mod h1:1fXstnBMas5kzG+S3q8UoJcmyU6nUeunJcMDHcRYHhs= github.com/Azure/azure-sdk-for-go/sdk/internal v1.3.0 h1:sXr+ck84g/ZlZUOZiNELInmMgOsuGwdjjVkEIde0OtY= github.com/Azure/azure-sdk-for-go/sdk/internal v1.3.0/go.mod h1:okt5dMMTOFjX/aovMlrjvvXoPMBVSPzk9185BT0+eZM= github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v0.5.1 h1:BMTdr+ib5ljLa9MxTJK8x/Ds0MbBb4MfuW5BL0zMJnI= @@ -522,8 +522,8 @@ github.com/google/s2a-go v0.1.4/go.mod h1:Ej+mSEMGRnqRzjc7VtF+jdBwYG5fuJfiZ8ELkj github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= -github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4= +github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/googleapis/enterprise-certificate-proxy v0.0.0-20220520183353-fd19c99a87aa/go.mod h1:17drOmN3MwGY7t0e+Ei9b45FFGA3fBs3x36SsCg1hq8= github.com/googleapis/enterprise-certificate-proxy v0.2.5 h1:UR4rDjcgpgEnqpIEvkiqTYKBCKLNmlge2eVjoZfySzM= github.com/googleapis/enterprise-certificate-proxy v0.2.5/go.mod h1:RxW0N9901Cko1VOCW3SXCpWP+mlIEkk2tP7jnHy9a3w= @@ -970,8 +970,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-20230921130928-63a603e651ed h1:iWQdY3S6DpWjelVvKKSKgS7LeLkhK4VaEnQfphB9ZXA= -github.com/thanos-io/objstore v0.0.0-20230921130928-63a603e651ed/go.mod h1:oJ82xgcBDzGJrEgUsjlTj6n01+ZWUMMUR8BlZzX5xDE= +github.com/thanos-io/objstore v0.0.0-20231112185854-37752ee64d98 h1:gx2MTto1UQRumGoJzY3aFPQ31Ov3nOV7NaD7j6q288k= +github.com/thanos-io/objstore v0.0.0-20231112185854-37752ee64d98/go.mod h1:JauBAcJ61tRSv9widgISVmA6akQXDeUMXBrVmWW4xog= github.com/thanos-io/promql-engine v0.0.0-20231013104847-4517c0d5f591 h1:6bZbFM+Mvy2kL8BeL8TJ5+5pV3sUR2PSLaZyw911rtQ= github.com/thanos-io/promql-engine v0.0.0-20231013104847-4517c0d5f591/go.mod h1:vfXJv1JXNdLfHnjsHsLLJl5tyI7KblF76Wo5lZ9YC4Q= github.com/themihai/gomemcache v0.0.0-20180902122335-24332e2d58ab h1:7ZR3hmisBWw77ZpO1/o86g+JV3VKlk3d48jopJxzTjU= From d69430db8ae110a5c6cc0eedac9130adfc171be4 Mon Sep 17 00:00:00 2001 From: Michael Hoffmann Date: Tue, 28 Nov 2023 12:29:48 +0100 Subject: [PATCH 5/7] Updates busybox SHA (#6897) (#6937) Signed-off-by: GitHub Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: fpetkovski --- .busybox-versions | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.busybox-versions b/.busybox-versions index 23656d81d3..b925f4994f 100644 --- a/.busybox-versions +++ b/.busybox-versions @@ -1,7 +1,7 @@ # Auto generated by busybox-updater.sh. DO NOT EDIT -amd64=9990834ed59b823ba7ea1374a4c4233f692926312ac3a1ae6b13b47be07d6934 -arm64=e96ea17e7b6a5fe22366931fe90dd5307bd6f5a3612ae14490d1b5f68b291476 -arm=a84fbdcadfd8715f11877dd3d963342e427a8718b1aa2d194115c85982cb33c5 -ppc64le=32a0ce3a915ec8b7b2ed4fb4e19a85d85af68384312fc9721b8f872ca03274a8 -riscv64=8bd68bf643b76d1b55788aee51399f6f2b910c5975dbad4ca9e624f88dd2e892 -s390x=b6863ec884fcce31cd1c7c3bb3bf6db1190ccc20845cee6dc034d82687e1b36c +amd64=393d14abb68b8b2d88304c72ac25b5ce130aa3a1d57ba7363e2c4d07d294513d +arm64=9fe410fe5b8f283d057939a5b0a6f464ecb4bfe4a07d132d2846cfbe82cf43ea +arm=a237b18458d6bcc8964e59ced627ea46eb9aae68875ea833c61d5050a742e624 +ppc64le=cbb9892625fd0d4c625afe8255fe35699a163bc4d74925dfcca74ee7cc43d4ba +riscv64=fa1350d80e4481d3671d808fbe239e4075205f69c940e7e85711bdc39bf8e181 +s390x=1e3e5a05847ad67da2b148d952931cf6f716a334ab06ea00742560a2ff985c7d From 1fbd4e6c5d6b182aa996addadf68947beff7ad53 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 15 Dec 2023 14:43:24 -0800 Subject: [PATCH 6/7] Updates busybox SHA (#6982) Signed-off-by: GitHub Co-authored-by: fpetkovski --- .busybox-versions | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.busybox-versions b/.busybox-versions index b925f4994f..6e255e7e70 100644 --- a/.busybox-versions +++ b/.busybox-versions @@ -1,7 +1,7 @@ # Auto generated by busybox-updater.sh. DO NOT EDIT -amd64=393d14abb68b8b2d88304c72ac25b5ce130aa3a1d57ba7363e2c4d07d294513d -arm64=9fe410fe5b8f283d057939a5b0a6f464ecb4bfe4a07d132d2846cfbe82cf43ea -arm=a237b18458d6bcc8964e59ced627ea46eb9aae68875ea833c61d5050a742e624 -ppc64le=cbb9892625fd0d4c625afe8255fe35699a163bc4d74925dfcca74ee7cc43d4ba -riscv64=fa1350d80e4481d3671d808fbe239e4075205f69c940e7e85711bdc39bf8e181 -s390x=1e3e5a05847ad67da2b148d952931cf6f716a334ab06ea00742560a2ff985c7d +amd64=f173c44fab35484fa0e940e42929efe2a2f506feda431ba72c5f0d79639d7f55 +arm64=6277ab6abe348994989b3959d7c125d7a487012aedb80570ec28652a012c69d6 +arm=31533906c9eadc190de436bcbc021207d90839777c1b95991edd15e7df5d34ad +ppc64le=ace2ea29bf8e4267c293ed5570df249039a0bc3949d3371429a71cf114e8a9e2 +riscv64=ff38cae5b5ed16251631e55156a7d92977bf5a8c4714ff6e3c333f7acb0297e0 +s390x=59d0ed3060aef57d1b23bc353a2223af24a6e1d035486647eb599a77ff2d446e From 4aea454c6c91a6a4d5d151ddd6a394a462b3f4fd Mon Sep 17 00:00:00 2001 From: Michael Hoffmann Date: Sun, 17 Dec 2023 15:39:44 +0100 Subject: [PATCH 7/7] VERSION: Bump version for release Signed-off-by: Michael Hoffmann --- CHANGELOG.md | 2 +- VERSION | 2 +- website/hugo.yaml | 4 ++++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 118abf0bf1..60171e3bf3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,7 +18,7 @@ We use *breaking :warning:* to mark changes that are not backward compatible (re ### Removed -## [v0.33.0](https://github.com/thanos-io/thanos/tree/release-0.33) - in progress +## [v0.33.0](https://github.com/thanos-io/thanos/tree/release-0.33) - 18.12.2023 ### Fixed diff --git a/VERSION b/VERSION index 42eb111047..be386c9ede 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.33.0-rc.0 +0.33.0 diff --git a/website/hugo.yaml b/website/hugo.yaml index 03877d582f..cae16ff499 100644 --- a/website/hugo.yaml +++ b/website/hugo.yaml @@ -28,6 +28,10 @@ permalinks: # TODO(bwplotka): Move to mdox + fixes to ensure we don't need to manually do this. # For now we added few entries for advance. tip: "/:sections/:filename.md" + v0.33: "/:sections/:filename.md" + v0.32: "/:sections/:filename.md" + v0.31: "/:sections/:filename.md" + v0.30: "/:sections/:filename.md" v0.29: "/:sections/:filename.md" v0.28: "/:sections/:filename.md" v0.27: "/:sections/:filename.md"