Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump thanos to v0.13 #30

Closed
wants to merge 17 commits into from
Closed

Bump thanos to v0.13 #30

wants to merge 17 commits into from

Conversation

paulfantom
Copy link

Bumped to v0.13 and applied thanos-io#2834 as per MON-1168

git merge --strategy-option theirs upstream/release-0.13
git cherry-pick e95b518d7ab02236d84e39bfd4e82d8b38dd1e5d

/cc @simonpasquier

bwplotka and others added 16 commits May 20, 2020 09:01
Signed-off-by: Bartlomiej Plotka <[email protected]>
Signed-off-by: Bartlomiej Plotka <[email protected]>
Signed-off-by: Bartlomiej Plotka <[email protected]>
) (thanos-io#2698)

* Allow using multiple memcached clients at the same time.

Signed-off-by: Peter Štibraný <[email protected]>

* Added unit test to verify that we can have multiple clients.

Signed-off-by: Peter Štibraný <[email protected]>

* Added CHANGELOG.md entry.

Signed-off-by: Peter Štibraný <[email protected]>

* Remove unused argument.

Signed-off-by: Peter Štibraný <[email protected]>
# Conflicts:
#	CHANGELOG.md
…rting for StoreAPI + Optimized iter chunk dedup. (thanos-io#2710) (thanos-io#2711)

* Deduplicate chunk dups on proxy StoreAPI level. Recommend chunk sorting for StoreAPI.

Also: Merge same series together on proxy level instead select. This allows better dedup efficiency.

Partially fixes: thanos-io#2303

Cases like overlapped data from store and sidecar and 1:1 duplicates are optimized as soon as it's possible.
This case was highly visible on GitLab repro data and exists in most of Thanos setup.

Signed-off-by: Bartlomiej Plotka <[email protected]>

* Optimized algorithm to combine series only on start.

Signed-off-by: Bartlomiej Plotka <[email protected]>

* Optimized chunk comparision for overlaps.

Signed-off-by: Bartlomiej Plotka <[email protected]>

* Optimized deduplication for deduplicated chunk on query level as well.

Never use proto .String() in fast path!

Signed-off-by: Bartlomiej Plotka <[email protected]>
# Conflicts:
#	CHANGELOG.md
#	pkg/store/storepb/custom.go
#	pkg/store/storepb/custom_test.go
…nts (thanos-io#2705) (thanos-io#2718)

* Updated minio dependency to v6.0.56 for af-south-1 region

Signed-off-by: Theunis Botha <[email protected]>

* Updated CHANGELOG.md

Signed-off-by: Theunis Botha <[email protected]>
Signed-off-by: Bartlomiej Plotka <[email protected]>

# Conflicts:
#	CHANGELOG.md
Signed-off-by: Bartlomiej Plotka <[email protected]>
…v0.13.0-rc.2 (thanos-io#2765)

* shipper: Be strict about upload order unless it's specified so.

Signed-off-by: Bartlomiej Plotka <[email protected]>

* Cut 0.13.0-rc.2

Signed-off-by: Bartlomiej Plotka <[email protected]>
Signed-off-by: Bartlomiej Plotka <[email protected]>
openshift/master

* upstream/release-0.13:
  Cut release v0.13.0
  shipper: Be strict about upload order unless it's specified so & cut v0.13.0-rc.2 (thanos-io#2765)
  Cut 0.13.0 release. (thanos-io#2762)
  Cut release 0.13.0-rc.1 (thanos-io#2720)
  Store: `irate` and `resets` use now counter downsampling aggregations. (thanos-io#2719)
  deps: Updated minio-go dependency to v6.0.56 to add two region endpoints (thanos-io#2705) (thanos-io#2718)
  store/proxy: Deduplicate chunks on StoreAPI level. Recommend chunk sorting for StoreAPI + Optimized iter chunk dedup. (thanos-io#2710) (thanos-io#2711)
  Allow using multiple memcached clients at the same time. (thanos-io#2648) (thanos-io#2698)
  Updated Prometheus as little as possible to include Isolation fix. (thanos-io#2697)
  Release fix attempt2.
  Fixed test job. (thanos-io#2650)
  Fixed promu build to build in compatible directory that crossbuild understands.
  Cut v0.13.0-rc.0 (thanos-io#2628)
Currently, alert state is rendered as upper case.
In Prometheus it is lower case.
This fixes it.

Signed-off-by: Sergiusz Urbaniak <[email protected]>
@openshift-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: paulfantom

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 8, 2020
@openshift-ci-robot
Copy link

@paulfantom: The following tests failed, say /retest to rerun all failed tests:

Test name Commit Details Rerun command
ci/prow/e2e-aws-upgrade 314baf3 link /test e2e-aws-upgrade
ci/prow/e2e-aws 314baf3 link /test e2e-aws
ci/prow/images 314baf3 link /test images

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

@paulfantom
Copy link
Author

/hold

@openshift-ci-robot openshift-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jul 8, 2020
@paulfantom
Copy link
Author

Closing in favor of #31

@paulfantom paulfantom closed this Jul 9, 2020
@paulfantom paulfantom deleted the 0.13 branch July 9, 2020 10:30
openshift-cherrypick-robot pushed a commit to openshift-cherrypick-robot/thanos that referenced this pull request Jan 10, 2025
*: Updates Prometheus BusyBox image SHAs
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants