Merge release 0.23 to main #5017
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Bartlomiej Plotka <bwplotka@gmail.com>
Signed-off-by: Bartlomiej Plotka <bwplotka@gmail.com>
…os-io#4684) * Sidecar: Fix process external label on promethues v2.28+ use units.Bytes config type (thanos-io#4657) * Sidecar: Fix process external label when promethues v2.28+ use units.Bytes config type (thanos-io#4656) Signed-off-by: hanjm <hanjinming@outlook.com> * E2E: Upgrade prometheus image version Signed-off-by: hanjm <hanjinming@outlook.com> * upgrade Prometheus dependency version to v2.30.0 (thanos-io#4669) * upgrade Prometheus dependency version to v2.30.0 Signed-off-by: Ben Ye <ben.ye@bytedance.com> * fix unit test Signed-off-by: Ben Ye <ben.ye@bytedance.com> # Conflicts: # go.mod # go.sum * Query: Fix (*exemplarsStream).receive/(*metricMetadataStream).receive/(*targetsStreamStream).receive infinite loop when target response Unimplemented error (thanos-io#4676) (thanos-io#4681) Signed-off-by: hanjm <hanjinming@outlook.com> * Cut 0.23.0-rc.1 Signed-off-by: Bartlomiej Plotka <bwplotka@gmail.com> Co-authored-by: Jimmiehan <hanjinming@outlook.com> Co-authored-by: Ben Ye <yb532204897@gmail.com>
…nos-io#4714) * Do not use info client to obtain metadata Signed-off-by: Matej Gera <matejgera@gmail.com> * Update CHANGELOG. Signed-off-by: Matej Gera <matejgera@gmail.com> * Comment out client.info usage Signed-off-by: Matej Gera <matejgera@gmail.com> * Fix lint error Signed-off-by: Matej Gera <matejgera@gmail.com>
Signed-off-by: Bartlomiej Plotka <bwplotka@gmail.com>
Avoid RLock()ing twice as described here: thanos-io#4766 (comment) (due to https://stackoverflow.com/questions/30547916/goroutine-blocks-when-calling-rwmutex-rlock-twice-after-an-rwmutex-unlock/30549188). Fix it by removing HasClients() and simply changing it with `er.clients != nil`. Signed-off-by: Giedrius Statkevičius <giedrius.statkevicius@vinted.com> Signed-off-by: Aymeric <aymeric.daurelle@cdiscount.com> Co-authored-by: Giedrius Statkevičius <giedriuswork@gmail.com>
Signed-off-by: Ben Ye <ben.ye@bytedance.com> Signed-off-by: Lucas Servén Marín <lserven@gmail.com>
Signed-off-by: Bartlomiej Plotka <bwplotka@gmail.com> Signed-off-by: Lucas Servén Marín <lserven@gmail.com>
Signed-off-by: Lucas Servén Marín <lserven@gmail.com>
* downsample: fix deadlock if error occurs (thanos-io#4962) Fix deadlock that occurs if there is some backlog of blocks to be deduplicated, and an error occurs. For this to trigger, there needs to be at least `downsampleConcurrency + 2` blocks in the backlog. Add test to cover this regression. Affected versions 0.22.0 - 0.23.1. Signed-off-by: Giedrius Statkevičius <giedrius.statkevicius@vinted.com> * VERSION: bump Signed-off-by: Giedrius Statkevičius <giedrius.statkevicius@vinted.com> * Makefile: update SHA256 Update from https://github.com/thanos-io/thanos/blob/main/Makefile#L16-L17. Signed-off-by: Giedrius Statkevičius <giedrius.statkevicius@vinted.com> * *: 0.23.2 -> 0.23.2-rc.1 Signed-off-by: Giedrius Statkevičius <giedrius.statkevicius@vinted.com>
Release 0.23.2. Signed-off-by: Giedrius Statkevičius <giedrius.statkevicius@vinted.com>
squat
force-pushed
the
merge-release-0.23-to-main
branch
2 times, most recently
from
a96a6e8
to
b0d054f
Compare
GiedriusS
approved these changes
Dec 31, 2021
|
It's weird.. DCO is complaining about a lot of the previous commits in there, including some of yours :( https://github.com/thanos-io/thanos/pull/5017/checks?check_run_id=4673473289 It seems to be complaining that people changed their email addresses, e.g. @vinted.com vs @gmail.com |
|
Weird :/ since all commits have |
|
Clicked "Set DCO to pass". |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This commit follows our release process and merges the latest commits/tags from the release-0.23 branch back into main. Next will be merging the release-0.24 branch back into main.
cc @GiedriusS