Skip to content

Commit

Permalink
Merge branch 'main' of https://github.com/thanos-io/thanos into add-t…
Browse files Browse the repository at this point in the history
…enant-receive-charts
  • Loading branch information
douglascamata committed Jul 11, 2022
2 parents 4aa6aaf + 6f3e412 commit df68c2c
Show file tree
Hide file tree
Showing 27 changed files with 2,375 additions and 301 deletions.
6 changes: 3 additions & 3 deletions .bingo/Variables.mk
Original file line number Diff line number Diff line change
Expand Up @@ -101,11 +101,11 @@ $(MDOX): $(BINGO_DIR)/mdox.mod
@echo "(re)installing $(GOBIN)/mdox-v0.9.0"
@cd $(BINGO_DIR) && $(GO) build -mod=mod -modfile=mdox.mod -o=$(GOBIN)/mdox-v0.9.0 "github.com/bwplotka/mdox"

MINIO := $(GOBIN)/minio-v0.0.0-20201125204248-91130e884b5d
MINIO := $(GOBIN)/minio-v0.0.0-20220704210254-b311abed3176
$(MINIO): $(BINGO_DIR)/minio.mod
@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
@echo "(re)installing $(GOBIN)/minio-v0.0.0-20201125204248-91130e884b5d"
@cd $(BINGO_DIR) && $(GO) build -mod=mod -modfile=minio.mod -o=$(GOBIN)/minio-v0.0.0-20201125204248-91130e884b5d "github.com/minio/minio"
@echo "(re)installing $(GOBIN)/minio-v0.0.0-20220704210254-b311abed3176"
@cd $(BINGO_DIR) && $(GO) build -mod=mod -modfile=minio.mod -o=$(GOBIN)/minio-v0.0.0-20220704210254-b311abed3176 "github.com/minio/minio"

PROMDOC := $(GOBIN)/promdoc-v0.8.0
$(PROMDOC): $(BINGO_DIR)/promdoc.mod
Expand Down
199 changes: 199 additions & 0 deletions .bingo/golangci-lint.sum

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion .bingo/minio.mod
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT

go 1.14

require github.com/minio/minio v0.0.0-20201125204248-91130e884b5d
require github.com/minio/minio v0.0.0-20220704210254-b311abed3176
1,727 changes: 1,727 additions & 0 deletions .bingo/minio.sum

Large diffs are not rendered by default.

6 changes: 5 additions & 1 deletion .bingo/prometheus.1.mod
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@ module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT

go 1.14

replace k8s.io/klog => github.com/simonpasquier/klog-gokit v0.1.0
replace (
github.com/json-iterator/go => github.com/json-iterator/go v1.1.12
github.com/modern-go/reflect2 => github.com/modern-go/reflect2 v1.0.2
k8s.io/klog => github.com/simonpasquier/klog-gokit v0.1.0
)

require github.com/prometheus/prometheus v1.8.2-0.20200724121523-657ba532e42f // cmd/prometheus
9 changes: 6 additions & 3 deletions .bingo/prometheus.2.mod
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,11 @@ module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT

go 1.15

replace k8s.io/klog => github.com/simonpasquier/klog-gokit v0.3.0

replace k8s.io/klog/v2 => github.com/simonpasquier/klog-gokit/v2 v2.0.1
replace (
github.com/json-iterator/go => github.com/json-iterator/go v1.1.12
github.com/modern-go/reflect2 => github.com/modern-go/reflect2 v1.0.2
k8s.io/klog => github.com/simonpasquier/klog-gokit v0.3.0
k8s.io/klog/v2 => github.com/simonpasquier/klog-gokit/v2 v2.0.1
)

require github.com/prometheus/prometheus v1.8.2-0.20210331101223-3cafc58827d1 // cmd/prometheus
2 changes: 2 additions & 0 deletions .bingo/prometheus.mod
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,9 @@ replace (
github.com/cockroachdb/cockroach => github.com/cockroachdb/cockroach v0.0.0-20170608034007-84bc9597164f
github.com/googleapis/gnostic => github.com/googleapis/gnostic v0.2.3-0.20180520015035-48a0ecefe2e4
github.com/gophercloud/gophercloud => github.com/gophercloud/gophercloud v0.18.0
github.com/json-iterator/go => github.com/json-iterator/go v1.1.12
github.com/miekg/dns => github.com/miekg/dns v1.0.4
github.com/modern-go/reflect2 => github.com/modern-go/reflect2 v1.0.2
github.com/prometheus/client_golang => github.com/prometheus/client_golang v0.9.0-pre1.0.20180607123607-faf4ec335fe0
github.com/prometheus/common => github.com/prometheus/common v0.0.0-20180518154759-7600349dcfe1
github.com/prometheus/tsdb => github.com/prometheus/tsdb v0.0.0-20180921053122-9c8ca47399a7
Expand Down
2 changes: 1 addition & 1 deletion .bingo/variables.env
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ JSONNETFMT="${GOBIN}/jsonnetfmt-v0.17.0"

MDOX="${GOBIN}/mdox-v0.9.0"

MINIO="${GOBIN}/minio-v0.0.0-20201125204248-91130e884b5d"
MINIO="${GOBIN}/minio-v0.0.0-20220704210254-b311abed3176"

PROMDOC="${GOBIN}/promdoc-v0.8.0"

Expand Down
12 changes: 6 additions & 6 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
version: 2.1

orbs:
go: circleci/go@1.5.0
go: circleci/go@1.7.1

executors:
golang:
docker:
- image: cimg/go:1.17-node
- image: cimg/go:1.18-node
golang-test:
docker:
- image: cimg/go:1.17-node
- image: cimg/go:1.18-node
- image: quay.io/thanos/docker-swift-onlyone-authv2-keystone:v0.1

jobs:
Expand All @@ -22,7 +22,7 @@ jobs:
- checkout
- go/mod-download-cached
- setup_remote_docker:
version: 20.10.11
version: 20.10.12
- run:
name: Create Secret if PR is not forked
# GCS integration tests are run only for author's PR that have write access, because these tests
Expand Down Expand Up @@ -74,7 +74,7 @@ jobs:
- checkout
- go/mod-download-cached
- setup_remote_docker:
version: 20.10.11
version: 20.10.12
- attach_workspace:
at: .
# Register qemu to support multi-arch.
Expand All @@ -96,7 +96,7 @@ jobs:
- checkout
- go/mod-download-cached
- setup_remote_docker:
version: 20.10.11
version: 20.10.12
- attach_workspace:
at: .
- run: make tarballs-release
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/go.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ jobs:
GOBIN: /tmp/.bin
steps:
- name: Install Go.
uses: actions/setup-go@v1
uses: actions/setup-go@v3
with:
go-version: 1.17.x
go-version: 1.18.x

- name: Check out code into the Go module directory
uses: actions/checkout@v1
Expand Down Expand Up @@ -59,16 +59,16 @@ jobs:
fail-fast: true
matrix:
parallelism: [4]
index: [0,1,2,3]
index: [0,1,2,3]
runs-on: ubuntu-latest
name: Thanos end-to-end tests
env:
GOBIN: /tmp/.bin
steps:
- name: Install Go.
uses: actions/setup-go@v1
uses: actions/setup-go@v3
with:
go-version: 1.17.x
go-version: 1.18.x

- name: Check out code into the Go module directory.
uses: actions/checkout@v2
Expand Down
2 changes: 1 addition & 1 deletion .go-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.17
1.18
2 changes: 1 addition & 1 deletion .promu.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
go:
version: 1.17
version: 1.18
repository:
path: github.com/thanos-io/thanos
build:
Expand Down
12 changes: 8 additions & 4 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,19 +9,25 @@ NOTE: As semantic versioning states all 0.y.z releases can contain breaking chan
We use *breaking :warning:* to mark changes that are not backward compatible (relates only to v0.y.z releases.)

## Unreleased
- [#5453](https://github.com/thanos-io/thanos/pull/5453) Compact: Skip erroneous empty non `*AggrChunk` chunks during 1h downsampling of 5m resolution blocks.

### Fixed

### Added

- [#5440](https://github.com/thanos-io/thanos/pull/5440) HTTP metrics: export number of in-flight HTTP requests.
- [#5424](https://github.com/thanos-io/thanos/pull/5424) Receive: Export metrics regarding size of remote write requests.
- [#5420](https://github.com/thanos-io/thanos/pull/5420) Receive: Automatically remove stale tenants.
- [#5472](https://github.com/thanos-io/thanos/pull/5472) Receive: add new tenant metrics to example dashboard.

### Changed

- [#5447](https://github.com/thanos-io/thanos/pull/5447) Promclient: Ignore 405 status codes for Prometheus buildVersion requests
- [#5451](https://github.com/thanos-io/thanos/pull/5451) Azure: Reduce memory usage by not buffering file downloads entirely in memory.

### Removed

## [v0.27.0-rc0](https://github.com/thanos-io/thanos/tree/release-0.27) - Release in progress
## [v0.27.0](https://github.com/thanos-io/thanos/tree/release-0.27) - 2022.07.05

### Fixed
- [#5339](https://github.com/thanos-io/thanos/pull/5339) Receive: Fix deadlock on interrupt in routerOnly mode.
Expand All @@ -36,13 +42,11 @@ We use *breaking :warning:* to mark changes that are not backward compatible (re
- [#5391](https://github.com/thanos-io/thanos/pull/5391) Receive: Add relabeling support.
- [#5408](https://github.com/thanos-io/thanos/pull/5408) Receive: Add support for consistent hashrings.
- [#5391](https://github.com/thanos-io/thanos/pull/5391) Receive: Implement api/v1/status/tsdb.
- [#5424](https://github.com/thanos-io/thanos/pull/5424) Receive: export metrics regarding size of remote write requests.
- [#5420](https://github.com/thanos-io/thanos/pull/5420) Receive: Automatically remove stale tenants.

### Changed

- [#5410](https://github.com/thanos-io/thanos/pull/5410) Query: Close() after using query. This should reduce bumps in memory allocations.
- [#5417](https://github.com/thanos-io/thanos/pull/5417) Ruler: Change default evaluation interval to 1 minute.
- [#5417](https://github.com/thanos-io/thanos/pull/5417) Ruler: *Breaking if you have not set this value (`--eval-interval`) yourself and rely on that value. :warning:*. Change the default evaluation interval from 30s to 1 minute in order to be compliant with Prometheus alerting compliance specification: https://github.com/prometheus/compliance/blob/main/alert_generator/specification.md#executing-an-alerting-rule.

### Removed

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.multi-stage
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# By default we pin to amd64 sha. Use make docker to automatically adjust for arm64 versions.
ARG BASE_DOCKER_SHA="14d68ca3d69fceaa6224250c83d81d935c053fb13594c811038c461194599973"
FROM golang:1.17-alpine3.15 as builder
FROM golang:1.18-alpine3.15 as builder

WORKDIR $GOPATH/src/github.com/thanos-io/thanos
# Change in the docker context invalidates the cache so to leverage docker
Expand Down
19 changes: 10 additions & 9 deletions MAINTAINERS.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,16 @@ We also have some nice souls that help triaging issues and PRs. See [here](https

Full list of triage persons is displayed below:

| Name | Slack | GitHub | Company |
|---------------|---------------|--------------------------------------------|---------|
| Adrien Fillon | `@Adrien F` | [@adrien-f](https://github.com/adrien-f) | |
| Ian Billett | `@billett` | [@bill3tt](https://github.com/bill3tt) | Red Hat |
| Martin Chodur | `@FUSAKLA` | [@fusakla](https://github.com/fusakla) | |
| Michael Dai | `@jojohappy` | [@jojohappy](https://github.com/jojohappy) | |
| Xiang Dai | `@daixiang0` | [@daixiang0](https://github.com/daixiang0) | |
| Jimmie Han | `@hanjm` | [@hanjm](https://github.com/hanjm) | Tencent |
| Matej Gera | `@Matej Gera` | [@matej-g](https://github.com/matej-g) | Red Hat |
| Name | Slack | GitHub | Company |
|-----------------|--------------------|----------------------------------------------|---------|
| Adrien Fillon | `@Adrien F` | [@adrien-f](https://github.com/adrien-f) | |
| Ian Billett | `@billett` | [@bill3tt](https://github.com/bill3tt) | Red Hat |
| Martin Chodur | `@FUSAKLA` | [@fusakla](https://github.com/fusakla) | |
| Michael Dai | `@jojohappy` | [@jojohappy](https://github.com/jojohappy) | |
| Xiang Dai | `@daixiang0` | [@daixiang0](https://github.com/daixiang0) | |
| Jimmie Han | `@hanjm` | [@hanjm](https://github.com/hanjm) | Tencent |
| Matej Gera | `@Matej Gera` | [@matej-g](https://github.com/matej-g) | Red Hat |
| Filip Petkovski | `@Filip Petkovski` | [@fpetkovski](https://github.com/fpetkovski) | |

Please reach any of the maintainer on slack or email if you want to help as well.

Expand Down
2 changes: 1 addition & 1 deletion docs/components/compact.md
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@ Generally there two scalability directions:

You should horizontally scale Compactor to cope with this using [label sharding](../sharding.md#compactor). This allows to assign multiple streams to each instance of compactor.

1. TSDB blocks from single stream is too big, it takes too much time or resources.
2. TSDB blocks from single stream is too big, it takes too much time or resources.

This is rare as first you would need to ingest that amount of data into Prometheus and it's usually not recommended to have bigger than 10 millions series in the 2 hours blocks. However, with 2 weeks blocks, potential [Vertical Compaction](#vertical-compactions) enabled and other producers than Prometheus (e.g backfilling) this scalability concern can appear as well. See [Limit size of blocks](https://github.com/thanos-io/thanos/issues/3068) ticket to track progress of solution if you are hitting this.

Expand Down
53 changes: 27 additions & 26 deletions docs/release-process.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,32 +21,33 @@ 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.28.0 | (planned) 2022.07.22 | No one ATM |
| v0.27.0 | 2022.06.10 | `@wiardvanrij` |
| 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.29.0 | (planned) 2022.09.29 | No one ATM |
| v0.28.0 | (planned) 2022.08.18 | No one ATM |
| 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

Expand Down
4 changes: 2 additions & 2 deletions docs/storage.md
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ Details about AWS policies: https://docs.aws.amazon.com/AmazonS3/latest/dev/usin

If you want to use IAM credential retrieved from an instance profile, Thanos needs to authenticate through AWS STS. For this purposes you can specify your own STS Endpoint.

By default Thanos will use endpoint: https://sts.amazonaws.com and AWS region coresponding endpoints.
By default Thanos will use endpoint: https://sts.amazonaws.com and AWS region corresponding endpoints.

#### GCS

Expand Down Expand Up @@ -826,7 +826,7 @@ Every series entry first holds its number of labels, followed by tuples of symbo

##### Label Index

A label index section indexes the existing (combined) values for one or more label names. The `#names` field determines the number of indexed label names, followed by the total number of entries in the `#entries` field. The body holds #entries / #names tuples of symbol table references, each tuple being of #names length. The value tuples are sorted in lexicographically increasing order. This is no longer used.
A label index section indexes the existing (combined) values for one or more label names. The `#names` field determines the number of indexed label names, followed by the total number of entries in the `#entries` field. The body holds #entries / #names tuples of symbol table references, each tuple being of `#names` length. The value tuples are sorted in lexicographically increasing order. This is no longer used.

```
┌───────────────┬────────────────┬────────────────┐
Expand Down

0 comments on commit df68c2c

Please sign in to comment.