Merge remote-tracking branch 'origin/main' into aws-sdk-auth

thanos-io · Sep 23, 2021 · ddd4d2b · ddd4d2b
2 parents b6f1f1d + 177b4f2
commit ddd4d2b
Show file tree

Hide file tree

Showing 33 changed files with 31,392 additions and 24,319 deletions.
diff --git a/.bingo/Variables.mk b/.bingo/Variables.mk
@@ -89,11 +89,11 @@ $(JSONNETFMT): $(BINGO_DIR)/jsonnetfmt.mod
 	@echo "(re)installing $(GOBIN)/jsonnetfmt-v0.17.0"
 	@cd $(BINGO_DIR) && $(GO) build -mod=mod -modfile=jsonnetfmt.mod -o=$(GOBIN)/jsonnetfmt-v0.17.0 "github.com/google/go-jsonnet/cmd/jsonnetfmt"
 
-MDOX := $(GOBIN)/mdox-v0.2.2-0.20210818122826-f16709a2bc2b
+MDOX := $(GOBIN)/mdox-v0.9.0
 $(MDOX): $(BINGO_DIR)/mdox.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)/mdox-v0.2.2-0.20210818122826-f16709a2bc2b"
-	@cd $(BINGO_DIR) && $(GO) build -mod=mod -modfile=mdox.mod -o=$(GOBIN)/mdox-v0.2.2-0.20210818122826-f16709a2bc2b "github.com/bwplotka/mdox"
+	@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-20200527010300-cccf2de129da
 $(MINIO): $(BINGO_DIR)/minio.mod

diff --git a/.bingo/mdox.mod b/.bingo/mdox.mod
@@ -2,4 +2,4 @@ module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT
 
 go 1.16
 
-require github.com/bwplotka/mdox v0.2.2-0.20210818122826-f16709a2bc2b
+require github.com/bwplotka/mdox v0.9.0
diff --git a/.bingo/variables.env b/.bingo/variables.env
@@ -32,7 +32,7 @@ JSONNET="${GOBIN}/jsonnet-v0.17.0"
 
 JSONNETFMT="${GOBIN}/jsonnetfmt-v0.17.0"
 
-MDOX="${GOBIN}/mdox-v0.2.2-0.20210818122826-f16709a2bc2b"
+MDOX="${GOBIN}/mdox-v0.9.0"
 
 MINIO="${GOBIN}/minio-v0.0.0-20200527010300-cccf2de129da"
 

diff --git a/.mdox.validate.yaml b/.mdox.validate.yaml
@@ -16,4 +16,7 @@ validators:
     type: 'ignore'
   # 301 errors even when curl-ed.
   - regex: 'envoyproxy\.io'
-    type: 'ignore'
+    type: 'ignore'
+  # couldn't reach even when curl-ed.
+  - regex: 'cloud\.baidu\.com'
+    type: 'ignore'
diff --git a/.mdox.yaml b/.mdox.yaml
@@ -1,7 +1,7 @@
 version: 1
 
-inputDir: "docs"
-outputDir: "website/docs-pre-processed/tip"
+inputDir: "$(INPUT_DIR)"
+outputDir: "$(OUTPUT_DIR)"
 extraInputGlobs:
   - "CHANGELOG.md"
   - "SECURITY.md"
@@ -16,7 +16,7 @@ localLinksStyle:
 
 transformations:
 
-  - glob: "../CHANGELOG.md"
+  - glob: "$(EXTERNAL_GLOB_REL)CHANGELOG.md"
     path: /thanos/CHANGELOG.md
     frontMatter:
       template: |
@@ -29,7 +29,7 @@ transformations:
         Found a typo, inconsistency or missing information in our docs?
         Help us to improve [Thanos](https://thanos.io) documentation by proposing a fix [on GitHub here](https://github.com/thanos-io/thanos/edit/main/{{ .Origin.Path }}) :heart:
 
-  - glob: "../MAINTAINERS.md"
+  - glob: "$(EXTERNAL_GLOB_REL)MAINTAINERS.md"
     path: /thanos/MAINTAINERS.md
     frontMatter:
       template: |
@@ -39,7 +39,7 @@ transformations:
         lastmod: "{{ .Origin.LastMod }}"
     backMatter: *docBackMatter
 
-  - glob: "../SECURITY.md"
+  - glob: "$(EXTERNAL_GLOB_REL)SECURITY.md"
     path: /thanos/SECURITY.md
     frontMatter:
       template: |
@@ -49,7 +49,7 @@ transformations:
         lastmod: "{{ .Origin.LastMod }}"
     backMatter: *docBackMatter
 
-  - glob: "../CODE_OF_CONDUCT.md"
+  - glob: "$(EXTERNAL_GLOB_REL)CODE_OF_CONDUCT.md"
     path: /contributing/CODE_OF_CONDUCT.md
     frontMatter:
       template: |
@@ -59,7 +59,7 @@ transformations:
         lastmod: "{{ .Origin.LastMod }}"
     backMatter: *docBackMatter
 
-  - glob: "../CONTRIBUTING.md"
+  - glob: "$(EXTERNAL_GLOB_REL)CONTRIBUTING.md"
     path: /contributing/CONTRIBUTING.md
     frontMatter:
       template: |

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,6 +12,14 @@ We use *breaking :warning:* to mark changes that are not backward compatible (re
 
 - [#4667](https://github.com/thanos-io/thanos/pull/4667) Add a pure aws-sdk auth for s3 storage.
 
+### Fixed
+
+- [#4663](https://github.com/thanos-io/thanos/pull/4663) Fetcher: Fix discovered data races
+
+### Added
+
+- [#4680](https://github.com/thanos-io/thanos/pull/4680) Query: add `exemplar.partial-response` flag to control partial response.
+
 ## v0.23.0 - In Progress
 
 ### Added

diff --git a/cmd/thanos/query.go b/cmd/thanos/query.go
@@ -146,6 +146,9 @@ func registerQuery(app *extkingpin.App) {
 	enableMetricMetadataPartialResponse := cmd.Flag("metric-metadata.partial-response", "Enable partial response for metric metadata endpoint. --no-metric-metadata.partial-response for disabling.").
 		Hidden().Default("true").Bool()
 
+	enableExemplarPartialResponse := cmd.Flag("exemplar.partial-response", "Enable partial response for exemplar endpoint. --no-exemplar.partial-response for disabling.").
+		Hidden().Default("true").Bool()
+
 	defaultEvaluationInterval := extkingpin.ModelDuration(cmd.Flag("query.default-evaluation-interval", "Set default evaluation interval for sub queries.").Default("1m"))
 
 	defaultRangeQueryStep := extkingpin.ModelDuration(cmd.Flag("query.default-step", "Set default step for range queries. Default step is only used when step is not set in UI. In such cases, Thanos UI will use default step to calculate resolution (resolution = max(rangeSeconds / 250, defaultStep)). This will not work from Grafana, but Grafana has __step variable which can be used.").
@@ -254,6 +257,7 @@ func registerQuery(app *extkingpin.App) {
 			*enableRulePartialResponse,
 			*enableTargetPartialResponse,
 			*enableMetricMetadataPartialResponse,
+			*enableExemplarPartialResponse,
 			fileSD,
 			time.Duration(*dnsSDInterval),
 			*dnsSDResolver,
@@ -316,6 +320,7 @@ func runQuery(
 	enableRulePartialResponse bool,
 	enableTargetPartialResponse bool,
 	enableMetricMetadataPartialResponse bool,
+	enableExemplarPartialResponse bool,
 	fileSD *file.Discovery,
 	dnsSDInterval time.Duration,
 	dnsSDResolver string,
@@ -554,6 +559,7 @@ func runQuery(
 			enableRulePartialResponse,
 			enableTargetPartialResponse,
 			enableMetricMetadataPartialResponse,
+			enableExemplarPartialResponse,
 			queryReplicaLabels,
 			flagsMap,
 			defaultRangeQueryStep,

diff --git a/examples/interactive/interactive_test.go b/examples/interactive/interactive_test.go
@@ -89,7 +89,7 @@ func createData() (perr error) {
 // TestReadOnlyThanosSetup runs read only Thanos setup that has data from `maxTimeFresh - 2w` to `maxTimeOld`, with extra monitoring and tracing for full playground experience.
 // Run with test args `-test.timeout 9999m`.
 func TestReadOnlyThanosSetup(t *testing.T) {
-	t.Skip("This is interactive test - it will until you will kill it or curl 'finish' endpoint. Comment and run as normal test to use it!")
+	t.Skip("This is interactive test - it will run until you will kill it or curl 'finish' endpoint. Comment and run as normal test to use it!")
 
 	// Create 20k series for 2w of TSDB blocks. Cache them to 'data' dir so we don't need to re-create on every run (it takes ~5m).
 	_, err := os.Stat(data)

diff --git a/go.mod b/go.mod
@@ -1,8 +1,8 @@
 module github.com/thanos-io/thanos
 
 require (
-	cloud.google.com/go v0.87.0
 	cloud.google.com/go/storage v1.10.0
+	cloud.google.com/go/trace v0.1.0
 	github.com/Azure/azure-pipeline-go v0.2.3
 	github.com/Azure/azure-storage-blob-go v0.13.0
 	github.com/Azure/go-autorest/autorest/adal v0.9.15
@@ -15,7 +15,7 @@ require (
 	github.com/blang/semver/v4 v4.0.0
 	github.com/bradfitz/gomemcache v0.0.0-20190913173617-a41fca850d0b
 	github.com/cespare/xxhash v1.1.0
-	github.com/cespare/xxhash/v2 v2.1.1
+	github.com/cespare/xxhash/v2 v2.1.2
 	github.com/chromedp/cdproto v0.0.0-20200424080200-0de008e41fa0
 	github.com/chromedp/chromedp v0.5.3
 	github.com/cortexproject/cortex v1.10.1-0.20210820081236-70dddb6b70b8
@@ -28,8 +28,7 @@ require (
 	github.com/fortytw2/leaktest v1.3.0
 	github.com/fsnotify/fsnotify v1.4.9
 	github.com/go-kit/kit v0.11.0
-	github.com/go-logfmt/logfmt v0.5.1 // indirect
-	github.com/go-openapi/strfmt v0.20.1
+	github.com/go-openapi/strfmt v0.20.2
 	github.com/gogo/protobuf v1.3.2
 	github.com/gogo/status v1.1.0
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da
@@ -45,7 +44,7 @@ require (
 	github.com/leanovate/gopter v0.2.4
 	github.com/lightstep/lightstep-tracer-go v0.18.1
 	github.com/lovoo/gcloud-opentracing v0.3.0
-	github.com/miekg/dns v1.1.42
+	github.com/miekg/dns v1.1.43
 	github.com/minio/minio-go/v7 v7.0.10
 	github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f
 	github.com/ncw/swift v1.0.52
@@ -56,12 +55,12 @@ require (
 	github.com/opentracing/opentracing-go v1.2.0
 	github.com/pkg/errors v0.9.1
 	github.com/pmezard/go-difflib v1.0.0
-	github.com/prometheus/alertmanager v0.22.3-0.20210726110322-3d86bd709df8
+	github.com/prometheus/alertmanager v0.23.0
 	github.com/prometheus/client_golang v1.11.0
 	github.com/prometheus/client_model v0.2.0
-	github.com/prometheus/common v0.29.0
-	github.com/prometheus/exporter-toolkit v0.6.0
-	github.com/prometheus/prometheus v1.8.2-0.20210720123808-b1ed4a0a663d
+	github.com/prometheus/common v0.30.0
+	github.com/prometheus/exporter-toolkit v0.6.1
+	github.com/prometheus/prometheus v1.8.2-0.20210914090109-37468d88dce8
 	github.com/tencentyun/cos-go-sdk-v5 v0.7.31
 	github.com/uber/jaeger-client-go v2.29.1+incompatible
 	github.com/uber/jaeger-lib v2.4.1+incompatible
@@ -72,13 +71,12 @@ require (
 	go.uber.org/automaxprocs v1.4.0
 	go.uber.org/goleak v1.1.10
 	golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e
-	golang.org/x/oauth2 v0.0.0-20210628180205-a41e5a781914
+	golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f
 	golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
-	golang.org/x/sys v0.0.0-20210820121016-41cdb8703e55 // indirect
 	golang.org/x/text v0.3.6
-	google.golang.org/api v0.50.0
-	google.golang.org/genproto v0.0.0-20210713002101-d411969a0d9a
-	google.golang.org/grpc v1.39.0
+	google.golang.org/api v0.56.0
+	google.golang.org/genproto v0.0.0-20210903162649-d08c68adba83
+	google.golang.org/grpc v1.40.0
 	gopkg.in/alecthomas/kingpin.v2 v2.2.6
 	gopkg.in/fsnotify.v1 v1.4.7
 	gopkg.in/yaml.v2 v2.4.0
@@ -96,7 +94,7 @@ replace (
 	// TODO: Remove this: https://github.com/thanos-io/thanos/issues/3967.
 	github.com/minio/minio-go/v7 => github.com/bwplotka/minio-go/v7 v7.0.11-0.20210324165441-f9927e5255a6
 	// Make sure Prometheus version is pinned as Prometheus semver does not include Go APIs.
-	github.com/prometheus/prometheus => github.com/prometheus/prometheus v1.8.2-0.20210720123808-b1ed4a0a663d
+	github.com/prometheus/prometheus => github.com/prometheus/prometheus v1.8.2-0.20210914090109-37468d88dce8
 	github.com/sercand/kuberesolver => github.com/sercand/kuberesolver v2.4.0+incompatible
 	google.golang.org/grpc => google.golang.org/grpc v1.29.1