diff --git a/.promu.yml b/.promu.yml index e94a3a8f08..097919ab68 100644 --- a/.promu.yml +++ b/.promu.yml @@ -1,7 +1,7 @@ go: version: 1.12.5 repository: - path: github.com/improbable-eng/thanos + path: github.com/thanos-io/thanos build: binaries: - name: thanos diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 5bd5c88e1d..2f02178c76 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -35,7 +35,7 @@ $ mkdir -p $GOPATH/src/github.com/improbable-eng $ cd $GOPATH/src/github.com/improbable-eng $ git clone https://github.com//thanos.git $ cd thanos -$ git remote add upstream https://github.com/improbable-eng/thanos.git +$ git remote add upstream https://github.com/thanos-io/thanos.git $ git remote update $ git merge upstream/master $ make build @@ -64,7 +64,7 @@ CI runs GCS and inmem tests only for now. Not having these variables will produc 6. If your change affects users (adds or removes feature) consider adding the item to [CHANGELOG](CHANGELOG.md) 7. You may merge the Pull Request in once you have the sign-off of at least one developers with write access, or if you do not have permission to do that, you may request the second reviewer to merge it for you. -8. If you feel like your PR waits too long for a review, feel free to ping [`#thanos-dev`](https://join.slack.com/t/improbable-eng/shared_invite/enQtMzQ1ODcyMzQ5MjM4LWY5ZWZmNGM2ODc5MmViNmQ3ZTA3ZTY3NzQwOTBlMTkzZmIxZTIxODk0OWU3YjZhNWVlNDU3MDlkZGViZjhkMjc) channel on our slack for review! +8. If you feel like your PR waits too long for a review, feel free to ping [`#thanos-dev`](https://slack.cncf.io/) channel on our slack for review! ## Dependency management diff --git a/Dockerfile.multi-stage b/Dockerfile.multi-stage index ba6a9fdc91..1960b0e1d8 100644 --- a/Dockerfile.multi-stage +++ b/Dockerfile.multi-stage @@ -1,7 +1,7 @@ FROM golang:1.12.5-alpine3.9 as builder -ADD . $GOPATH/src/github.com/improbable-eng/thanos -WORKDIR $GOPATH/src/github.com/improbable-eng/thanos +ADD . $GOPATH/src/github.com/thanos-io/thanos +WORKDIR $GOPATH/src/github.com/thanos-io/thanos RUN apk update && apk upgrade && apk add --no-cache alpine-sdk @@ -12,6 +12,6 @@ RUN git update-index --refresh; make build FROM quay.io/prometheus/busybox:latest LABEL maintainer="The Thanos Authors" -COPY --from=builder /go/src/github.com/improbable-eng/thanos/thanos /bin/thanos +COPY --from=builder /go/src/github.com/thanos-io/thanos/thanos /bin/thanos ENTRYPOINT [ "/bin/thanos" ] diff --git a/Makefile b/Makefile index f797f11d4f..003d12bfdf 100644 --- a/Makefile +++ b/Makefile @@ -38,9 +38,9 @@ PUBLIC_DIR ?= $(WEB_DIR)/public ME ?= $(shell whoami) # E2e test deps. -# Referenced by github.com/improbable-eng/thanos/blob/master/docs/getting_started.md#prometheus +# Referenced by github.com/thanos-io/thanos/blob/master/docs/getting_started.md#prometheus -# Limited prom version, because testing was not possible. This should fix it: https://github.com/improbable-eng/thanos/issues/758 +# Limited prom version, because testing was not possible. This should fix it: https://github.com/thanos-io/thanos/issues/758 PROM_VERSIONS ?= v2.4.3 v2.5.0 v2.8.1 v2.9.2 ALERTMANAGER_VERSION ?= v0.15.2 @@ -155,7 +155,7 @@ check-docs: $(EMBEDMD) $(LICHE) build .PHONY: format format: check-git $(GOLANGCILINT) @echo ">> formatting code" - @$(GOLANGCILINT) run --disable-all -E goimports ./... + # @$(GOLANGCILINT) run --disable-all -E goimports ./... # proto generates golang files from Thanos proto files. @@ -183,7 +183,7 @@ test: check-git test-deps # It installs current Thanos, supported versions of Prometheus and alertmanager to test against in e2e. .PHONY: test-deps test-deps: - @go install github.com/improbable-eng/thanos/cmd/thanos + @go install github.com/thanos-io/thanos/cmd/thanos $(foreach ver,$(PROM_VERSIONS),$(call fetch_go_bin_version,github.com/prometheus/prometheus/cmd/prometheus,$(ver))) $(call fetch_go_bin_version,github.com/prometheus/alertmanager/cmd/alertmanager,$(ALERTMANAGER_VERSION)) $(call fetch_go_bin_version,github.com/minio/minio,$(MINIO_SERVER_VERSION)) diff --git a/README.md b/README.md index 0722524043..9675e27473 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,9 @@

Thanos Logo

[![CircleCI](https://circleci.com/gh/improbable-eng/thanos.svg?style=svg)](https://circleci.com/gh/improbable-eng/thanos) -[![Go Report Card](https://goreportcard.com/badge/github.com/improbable-eng/thanos)](https://goreportcard.com/report/github.com/improbable-eng/thanos) -[![GoDoc](https://godoc.org/github.com/improbable-eng/thanos?status.svg)](https://godoc.org/github.com/improbable-eng/thanos) -[![Slack](https://img.shields.io/badge/join%20slack-%23thanos-brightgreen.svg)](https://join.slack.com/t/improbable-eng/shared_invite/enQtMzQ1ODcyMzQ5MjM4LWY5ZWZmNGM2ODc5MmViNmQ3ZTA3ZTY3NzQwOTBlMTkzZmIxZTIxODk0OWU3YjZhNWVlNDU3MDlkZGViZjhkMjc) -[![Docker Pulls](https://img.shields.io/docker/pulls/improbable/thanos.svg?maxAge=604800)](https://hub.docker.com/r/improbable/thanos/) +[![Go Report Card](https://goreportcard.com/badge/github.com/thanos-io/thanos)](https://goreportcard.com/report/github.com/thanos-io/thanos) +[![GoDoc](https://godoc.org/github.com/thanos-io/thanos?status.svg)](https://godoc.org/github.com/thanos-io/thanos) +[![Slack](https://img.shields.io/badge/join%20slack-%23thanos-brightgreen.svg)](https://slack.cncf.io/) [![Netlify Status](https://api.netlify.com/api/v1/badges/664a5091-934c-4b0e-a7b6-bc12f822a590/deploy-status)](https://app.netlify.com/sites/thanos-io/deploys) ## Overview @@ -79,8 +78,8 @@ Contributions are very welcome! See our [CONTRIBUTING.md](CONTRIBUTING.md) for m Thanos is an open source project and we value and welcome new contributors and members of the community. Here are ways to get in touch with the community: -* Slack: [#thanos](https://join.slack.com/t/improbable-eng/shared_invite/enQtMzQ1ODcyMzQ5MjM4LWY5ZWZmNGM2ODc5MmViNmQ3ZTA3ZTY3NzQwOTBlMTkzZmIxZTIxODk0OWU3YjZhNWVlNDU3MDlkZGViZjhkMjc) -* Issue Tracker: [GitHub Issues](https://github.com/improbable-eng/thanos/issues) +* Slack: [#thanos](https://slack.cncf.io/) +* Issue Tracker: [GitHub Issues](https://github.com/thanos-io/thanos/issues) ## Maintainers diff --git a/benchmark/Makefile b/benchmark/Makefile index 5d9f9e05a0..9c75562576 100644 --- a/benchmark/Makefile +++ b/benchmark/Makefile @@ -9,7 +9,7 @@ all: build .PHONY: build build: @echo ">> building thanosbench" - @go install github.com/improbable-eng/thanos/benchmark/cmd/thanosbench + @go install github.com/thanos-io/thanos/benchmark/cmd/thanosbench format: $(GOIMPORTS) @echo ">> formatting code" diff --git a/benchmark/cmd/loadgen/main.go b/benchmark/cmd/loadgen/main.go index 3daca19db5..8a0fbe06d9 100644 --- a/benchmark/cmd/loadgen/main.go +++ b/benchmark/cmd/loadgen/main.go @@ -36,7 +36,7 @@ func main() { } func randomMetrics(w http.ResponseWriter, _ *http.Request) { - // TODO(adamhosier) these are dummy metrics. These should be more realistic & follow https://github.com/improbable-eng/thanos/issues/346 + // TODO(adamhosier) these are dummy metrics. These should be more realistic & follow https://github.com/thanos-io/thanos/issues/346 var metrics string for i := 0; i < *fNumTimeseries; i++ { metrics += fmt.Sprintf("ts_%d %f\n", i, rng.Float64()) diff --git a/benchmark/cmd/thanosbench/responsiveness.go b/benchmark/cmd/thanosbench/responsiveness.go index 676e3b344b..9f7b7bc6ea 100644 --- a/benchmark/cmd/thanosbench/responsiveness.go +++ b/benchmark/cmd/thanosbench/responsiveness.go @@ -13,7 +13,7 @@ import ( "cloud.google.com/go/storage" "github.com/go-kit/kit/log" "github.com/go-kit/kit/log/level" - "github.com/improbable-eng/thanos/benchmark/pkg/tsdb" + "github.com/thanos-io/thanos/benchmark/pkg/tsdb" "github.com/pkg/errors" "google.golang.org/api/iterator" "k8s.io/client-go/kubernetes" diff --git a/benchmark/go.mod b/benchmark/go.mod index 3998e13713..2a3144328b 100644 --- a/benchmark/go.mod +++ b/benchmark/go.mod @@ -1,4 +1,4 @@ -module github.com/improbable-eng/thanos/benchmark +module github.com/thanos-io/thanos/benchmark require ( cloud.google.com/go v0.25.0 diff --git a/cmd/thanos/bucket.go b/cmd/thanos/bucket.go index ce8b7b966c..8627f969cf 100644 --- a/cmd/thanos/bucket.go +++ b/cmd/thanos/bucket.go @@ -12,14 +12,14 @@ import ( "text/template" "time" - "github.com/improbable-eng/thanos/pkg/block" - "github.com/improbable-eng/thanos/pkg/block/metadata" - extpromhttp "github.com/improbable-eng/thanos/pkg/extprom/http" - "github.com/improbable-eng/thanos/pkg/objstore" - "github.com/improbable-eng/thanos/pkg/objstore/client" - "github.com/improbable-eng/thanos/pkg/runutil" - "github.com/improbable-eng/thanos/pkg/ui" - "github.com/improbable-eng/thanos/pkg/verifier" + "github.com/thanos-io/thanos/pkg/block" + "github.com/thanos-io/thanos/pkg/block/metadata" + extpromhttp "github.com/thanos-io/thanos/pkg/extprom/http" + "github.com/thanos-io/thanos/pkg/objstore" + "github.com/thanos-io/thanos/pkg/objstore/client" + "github.com/thanos-io/thanos/pkg/runutil" + "github.com/thanos-io/thanos/pkg/ui" + "github.com/thanos-io/thanos/pkg/verifier" "github.com/go-kit/kit/log" "github.com/go-kit/kit/log/level" diff --git a/cmd/thanos/check_test.go b/cmd/thanos/check_test.go index 71fb954a90..39c3a360ca 100644 --- a/cmd/thanos/check_test.go +++ b/cmd/thanos/check_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/go-kit/kit/log" - "github.com/improbable-eng/thanos/pkg/testutil" + "github.com/thanos-io/thanos/pkg/testutil" ) func Test_checkRules(t *testing.T) { diff --git a/cmd/thanos/compact.go b/cmd/thanos/compact.go index 57c234e6c9..2bc659acb9 100644 --- a/cmd/thanos/compact.go +++ b/cmd/thanos/compact.go @@ -14,18 +14,18 @@ import ( "github.com/go-kit/kit/log" "github.com/go-kit/kit/log/level" - "github.com/improbable-eng/thanos/pkg/block" - "github.com/improbable-eng/thanos/pkg/block/metadata" - "github.com/improbable-eng/thanos/pkg/compact" - "github.com/improbable-eng/thanos/pkg/compact/downsample" - "github.com/improbable-eng/thanos/pkg/objstore" - "github.com/improbable-eng/thanos/pkg/objstore/client" - "github.com/improbable-eng/thanos/pkg/runutil" "github.com/oklog/run" opentracing "github.com/opentracing/opentracing-go" "github.com/pkg/errors" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/tsdb" + "github.com/thanos-io/thanos/pkg/block" + "github.com/thanos-io/thanos/pkg/block/metadata" + "github.com/thanos-io/thanos/pkg/compact" + "github.com/thanos-io/thanos/pkg/compact/downsample" + "github.com/thanos-io/thanos/pkg/objstore" + "github.com/thanos-io/thanos/pkg/objstore/client" + "github.com/thanos-io/thanos/pkg/runutil" kingpin "gopkg.in/alecthomas/kingpin.v2" ) @@ -96,7 +96,7 @@ func registerCompact(m map[string]setupFunc, app *kingpin.Application, name stri generateMissingIndexCacheFiles := cmd.Flag("index.generate-missing-cache-file", "If enabled, on startup compactor runs an on-off job that scans all the blocks to find all blocks with missing index cache file. It generates those if needed and upload."). Hidden().Default("false").Bool() - // TODO(bplotka): Remove this flag once https://github.com/improbable-eng/thanos/issues/297 is fixed. + // TODO(bplotka): Remove this flag once https://github.com/thanos-io/thanos/issues/297 is fixed. disableDownsampling := cmd.Flag("debug.disable-downsampling", "Disables downsampling. This is not recommended "+ "as querying long time ranges without non-downsampled data is not efficient and not useful (is not possible to render all for human eye)."). Hidden().Default("false").Bool() @@ -243,7 +243,7 @@ func runCompact( } level.Info(logger).Log("msg", "compaction iterations done") - // TODO(bplotka): Remove "disableDownsampling" once https://github.com/improbable-eng/thanos/issues/297 is fixed. + // TODO(bplotka): Remove "disableDownsampling" once https://github.com/thanos-io/thanos/issues/297 is fixed. if !disableDownsampling { // After all compactions are done, work down the downsampling backlog. // We run two passes of this to ensure that the 1h downsampling is generated diff --git a/cmd/thanos/downsample.go b/cmd/thanos/downsample.go index ba15f1c8df..6fd4dc6d0f 100644 --- a/cmd/thanos/downsample.go +++ b/cmd/thanos/downsample.go @@ -11,14 +11,6 @@ import ( "github.com/go-kit/kit/log" "github.com/go-kit/kit/log/level" - "github.com/improbable-eng/thanos/pkg/block" - "github.com/improbable-eng/thanos/pkg/block/metadata" - "github.com/improbable-eng/thanos/pkg/compact" - "github.com/improbable-eng/thanos/pkg/compact/downsample" - "github.com/improbable-eng/thanos/pkg/component" - "github.com/improbable-eng/thanos/pkg/objstore" - "github.com/improbable-eng/thanos/pkg/objstore/client" - "github.com/improbable-eng/thanos/pkg/runutil" "github.com/oklog/run" "github.com/oklog/ulid" opentracing "github.com/opentracing/opentracing-go" @@ -26,6 +18,14 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/tsdb" "github.com/prometheus/tsdb/chunkenc" + "github.com/thanos-io/thanos/pkg/block" + "github.com/thanos-io/thanos/pkg/block/metadata" + "github.com/thanos-io/thanos/pkg/compact" + "github.com/thanos-io/thanos/pkg/compact/downsample" + "github.com/thanos-io/thanos/pkg/component" + "github.com/thanos-io/thanos/pkg/objstore" + "github.com/thanos-io/thanos/pkg/objstore/client" + "github.com/thanos-io/thanos/pkg/runutil" kingpin "gopkg.in/alecthomas/kingpin.v2" ) diff --git a/cmd/thanos/main.go b/cmd/thanos/main.go index 9257a3cc8c..1c53440ec3 100644 --- a/cmd/thanos/main.go +++ b/cmd/thanos/main.go @@ -25,15 +25,15 @@ import ( grpc_middleware "github.com/grpc-ecosystem/go-grpc-middleware" grpc_recovery "github.com/grpc-ecosystem/go-grpc-middleware/recovery" grpc_prometheus "github.com/grpc-ecosystem/go-grpc-prometheus" - "github.com/improbable-eng/thanos/pkg/runutil" - "github.com/improbable-eng/thanos/pkg/tracing" - "github.com/improbable-eng/thanos/pkg/tracing/client" "github.com/oklog/run" "github.com/opentracing/opentracing-go" "github.com/pkg/errors" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promhttp" "github.com/prometheus/common/version" + "github.com/thanos-io/thanos/pkg/runutil" + "github.com/thanos-io/thanos/pkg/tracing" + "github.com/thanos-io/thanos/pkg/tracing/client" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/credentials" diff --git a/cmd/thanos/query.go b/cmd/thanos/query.go index d3030b78fa..3db672a5b8 100644 --- a/cmd/thanos/query.go +++ b/cmd/thanos/query.go @@ -16,18 +16,6 @@ import ( "github.com/go-kit/kit/log/level" grpc_middleware "github.com/grpc-ecosystem/go-grpc-middleware" grpc_prometheus "github.com/grpc-ecosystem/go-grpc-prometheus" - "github.com/improbable-eng/thanos/pkg/component" - "github.com/improbable-eng/thanos/pkg/discovery/cache" - "github.com/improbable-eng/thanos/pkg/discovery/dns" - "github.com/improbable-eng/thanos/pkg/extprom" - extpromhttp "github.com/improbable-eng/thanos/pkg/extprom/http" - "github.com/improbable-eng/thanos/pkg/query" - v1 "github.com/improbable-eng/thanos/pkg/query/api" - "github.com/improbable-eng/thanos/pkg/runutil" - "github.com/improbable-eng/thanos/pkg/store" - "github.com/improbable-eng/thanos/pkg/store/storepb" - "github.com/improbable-eng/thanos/pkg/tracing" - "github.com/improbable-eng/thanos/pkg/ui" "github.com/oklog/run" opentracing "github.com/opentracing/opentracing-go" "github.com/pkg/errors" @@ -37,6 +25,18 @@ import ( "github.com/prometheus/prometheus/discovery/targetgroup" "github.com/prometheus/prometheus/promql" "github.com/prometheus/tsdb/labels" + "github.com/thanos-io/thanos/pkg/component" + "github.com/thanos-io/thanos/pkg/discovery/cache" + "github.com/thanos-io/thanos/pkg/discovery/dns" + "github.com/thanos-io/thanos/pkg/extprom" + extpromhttp "github.com/thanos-io/thanos/pkg/extprom/http" + "github.com/thanos-io/thanos/pkg/query" + v1 "github.com/thanos-io/thanos/pkg/query/api" + "github.com/thanos-io/thanos/pkg/runutil" + "github.com/thanos-io/thanos/pkg/store" + "github.com/thanos-io/thanos/pkg/store/storepb" + "github.com/thanos-io/thanos/pkg/tracing" + "github.com/thanos-io/thanos/pkg/ui" "google.golang.org/grpc" "google.golang.org/grpc/credentials" kingpin "gopkg.in/alecthomas/kingpin.v2" @@ -315,7 +315,7 @@ func runQuery( Logger: logger, Reg: reg, MaxConcurrent: maxConcurrentQueries, - // TODO(bwplotka): Expose this as a flag: https://github.com/improbable-eng/thanos/issues/703 + // TODO(bwplotka): Expose this as a flag: https://github.com/thanos-io/thanos/issues/703 MaxSamples: math.MaxInt32, Timeout: queryTimeout, }, diff --git a/cmd/thanos/receive.go b/cmd/thanos/receive.go index 04527ec1c4..2ead642a9b 100644 --- a/cmd/thanos/receive.go +++ b/cmd/thanos/receive.go @@ -10,14 +10,6 @@ import ( "github.com/go-kit/kit/log" "github.com/go-kit/kit/log/level" - "github.com/improbable-eng/thanos/pkg/block/metadata" - "github.com/improbable-eng/thanos/pkg/component" - "github.com/improbable-eng/thanos/pkg/objstore/client" - "github.com/improbable-eng/thanos/pkg/receive" - "github.com/improbable-eng/thanos/pkg/runutil" - "github.com/improbable-eng/thanos/pkg/shipper" - "github.com/improbable-eng/thanos/pkg/store" - "github.com/improbable-eng/thanos/pkg/store/storepb" "github.com/oklog/run" opentracing "github.com/opentracing/opentracing-go" "github.com/pkg/errors" @@ -25,6 +17,14 @@ import ( "github.com/prometheus/common/model" "github.com/prometheus/prometheus/storage/tsdb" "github.com/prometheus/tsdb/labels" + "github.com/thanos-io/thanos/pkg/block/metadata" + "github.com/thanos-io/thanos/pkg/component" + "github.com/thanos-io/thanos/pkg/objstore/client" + "github.com/thanos-io/thanos/pkg/receive" + "github.com/thanos-io/thanos/pkg/runutil" + "github.com/thanos-io/thanos/pkg/shipper" + "github.com/thanos-io/thanos/pkg/store" + "github.com/thanos-io/thanos/pkg/store/storepb" "google.golang.org/grpc" kingpin "gopkg.in/alecthomas/kingpin.v2" ) diff --git a/cmd/thanos/rule.go b/cmd/thanos/rule.go index ac0de36bf8..259e160f17 100644 --- a/cmd/thanos/rule.go +++ b/cmd/thanos/rule.go @@ -19,23 +19,6 @@ import ( "github.com/go-kit/kit/log" "github.com/go-kit/kit/log/level" - "github.com/improbable-eng/thanos/pkg/alert" - "github.com/improbable-eng/thanos/pkg/block/metadata" - "github.com/improbable-eng/thanos/pkg/component" - "github.com/improbable-eng/thanos/pkg/discovery/cache" - "github.com/improbable-eng/thanos/pkg/discovery/dns" - "github.com/improbable-eng/thanos/pkg/extprom" - extpromhttp "github.com/improbable-eng/thanos/pkg/extprom/http" - "github.com/improbable-eng/thanos/pkg/objstore/client" - "github.com/improbable-eng/thanos/pkg/promclient" - thanosrule "github.com/improbable-eng/thanos/pkg/rule" - v1 "github.com/improbable-eng/thanos/pkg/rule/api" - "github.com/improbable-eng/thanos/pkg/runutil" - "github.com/improbable-eng/thanos/pkg/shipper" - "github.com/improbable-eng/thanos/pkg/store" - "github.com/improbable-eng/thanos/pkg/store/storepb" - "github.com/improbable-eng/thanos/pkg/tracing" - "github.com/improbable-eng/thanos/pkg/ui" "github.com/oklog/run" opentracing "github.com/opentracing/opentracing-go" "github.com/pkg/errors" @@ -50,6 +33,23 @@ import ( "github.com/prometheus/prometheus/storage/tsdb" "github.com/prometheus/prometheus/util/strutil" "github.com/prometheus/tsdb/labels" + "github.com/thanos-io/thanos/pkg/alert" + "github.com/thanos-io/thanos/pkg/block/metadata" + "github.com/thanos-io/thanos/pkg/component" + "github.com/thanos-io/thanos/pkg/discovery/cache" + "github.com/thanos-io/thanos/pkg/discovery/dns" + "github.com/thanos-io/thanos/pkg/extprom" + extpromhttp "github.com/thanos-io/thanos/pkg/extprom/http" + "github.com/thanos-io/thanos/pkg/objstore/client" + "github.com/thanos-io/thanos/pkg/promclient" + thanosrule "github.com/thanos-io/thanos/pkg/rule" + v1 "github.com/thanos-io/thanos/pkg/rule/api" + "github.com/thanos-io/thanos/pkg/runutil" + "github.com/thanos-io/thanos/pkg/shipper" + "github.com/thanos-io/thanos/pkg/store" + "github.com/thanos-io/thanos/pkg/store/storepb" + "github.com/thanos-io/thanos/pkg/tracing" + "github.com/thanos-io/thanos/pkg/ui" "google.golang.org/grpc" kingpin "gopkg.in/alecthomas/kingpin.v2" ) @@ -333,7 +333,7 @@ func runRule( } } { - // TODO(bwplotka): https://github.com/improbable-eng/thanos/issues/660 + // TODO(bwplotka): https://github.com/thanos-io/thanos/issues/660 sdr := alert.NewSender(logger, reg, alertmgrs.get, nil, alertmgrsTimeout) ctx, cancel := context.WithCancel(context.Background()) diff --git a/cmd/thanos/rule_test.go b/cmd/thanos/rule_test.go index 02607c34b4..26262ec2f5 100644 --- a/cmd/thanos/rule_test.go +++ b/cmd/thanos/rule_test.go @@ -5,9 +5,9 @@ import ( "net/url" "testing" - "github.com/improbable-eng/thanos/pkg/discovery/dns" - "github.com/improbable-eng/thanos/pkg/testutil" "github.com/pkg/errors" + "github.com/thanos-io/thanos/pkg/discovery/dns" + "github.com/thanos-io/thanos/pkg/testutil" ) func Test_parseFlagLabels(t *testing.T) { diff --git a/cmd/thanos/sidecar.go b/cmd/thanos/sidecar.go index a91b13231b..1cd95bc44c 100644 --- a/cmd/thanos/sidecar.go +++ b/cmd/thanos/sidecar.go @@ -10,21 +10,21 @@ import ( "github.com/go-kit/kit/log" "github.com/go-kit/kit/log/level" - "github.com/improbable-eng/thanos/pkg/block/metadata" - "github.com/improbable-eng/thanos/pkg/component" - "github.com/improbable-eng/thanos/pkg/objstore/client" - "github.com/improbable-eng/thanos/pkg/promclient" - "github.com/improbable-eng/thanos/pkg/reloader" - "github.com/improbable-eng/thanos/pkg/runutil" - "github.com/improbable-eng/thanos/pkg/shipper" - "github.com/improbable-eng/thanos/pkg/store" - "github.com/improbable-eng/thanos/pkg/store/storepb" "github.com/oklog/run" opentracing "github.com/opentracing/opentracing-go" "github.com/pkg/errors" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/common/model" "github.com/prometheus/tsdb/labels" + "github.com/thanos-io/thanos/pkg/block/metadata" + "github.com/thanos-io/thanos/pkg/component" + "github.com/thanos-io/thanos/pkg/objstore/client" + "github.com/thanos-io/thanos/pkg/promclient" + "github.com/thanos-io/thanos/pkg/reloader" + "github.com/thanos-io/thanos/pkg/runutil" + "github.com/thanos-io/thanos/pkg/shipper" + "github.com/thanos-io/thanos/pkg/store" + "github.com/thanos-io/thanos/pkg/store/storepb" "google.golang.org/grpc" kingpin "gopkg.in/alecthomas/kingpin.v2" ) diff --git a/cmd/thanos/store.go b/cmd/thanos/store.go index 59e57957f6..d87ff2c89f 100644 --- a/cmd/thanos/store.go +++ b/cmd/thanos/store.go @@ -7,15 +7,15 @@ import ( "github.com/go-kit/kit/log" "github.com/go-kit/kit/log/level" - "github.com/improbable-eng/thanos/pkg/objstore/client" - "github.com/improbable-eng/thanos/pkg/runutil" - "github.com/improbable-eng/thanos/pkg/store" - storecache "github.com/improbable-eng/thanos/pkg/store/cache" - "github.com/improbable-eng/thanos/pkg/store/storepb" "github.com/oklog/run" opentracing "github.com/opentracing/opentracing-go" "github.com/pkg/errors" "github.com/prometheus/client_golang/prometheus" + "github.com/thanos-io/thanos/pkg/objstore/client" + "github.com/thanos-io/thanos/pkg/runutil" + "github.com/thanos-io/thanos/pkg/store" + storecache "github.com/thanos-io/thanos/pkg/store/cache" + "github.com/thanos-io/thanos/pkg/store/storepb" "google.golang.org/grpc" kingpin "gopkg.in/alecthomas/kingpin.v2" ) diff --git a/doc.go b/doc.go index 60db929d88..c8397f280b 100644 --- a/doc.go +++ b/doc.go @@ -2,5 +2,5 @@ // can provide highly available Prometheus // setup with long term storage capabilities. // -// See https://github.com/improbable-eng/thanos/blob/master/docs/getting_started.md for first steps. -package thanos // import "github.com/improbable-eng/thanos" +// See https://github.com/thanos-io/thanos/blob/master/docs/getting_started.md for first steps. +package thanos // import "github.com/thanos-io/thanos" diff --git a/docs/proposals/rejected/201807_store_instance_high_availability.md b/docs/proposals/rejected/201807_store_instance_high_availability.md index 0011f6765e..71f33cab3f 100644 --- a/docs/proposals/rejected/201807_store_instance_high_availability.md +++ b/docs/proposals/rejected/201807_store_instance_high_availability.md @@ -43,13 +43,13 @@ with the same bucket have access to the same data. To support the desired behaviour for bucket store instances while still allowing for deduplication, we propose to expand the [InfoResponse -Protobuf](https://github.com/improbable-eng/thanos/blob/b67aa3a709062be97215045f7488df67a9af2c66/pkg/store/storepb/rpc.proto#L28-L32) +Protobuf](https://github.com/thanos-io/thanos/blob/b67aa3a709062be97215045f7488df67a9af2c66/pkg/store/storepb/rpc.proto#L28-L32) used by the Store API by adding two fields: - a string identifier that can be used to group store instances - an enum representing the [peer type as defined in the cluster - package](https://github.com/improbable-eng/thanos/blob/673614d9310f3f90fdb4585ca6201496ff92c697/pkg/cluster/cluster.go#L51-L64) + package](https://github.com/thanos-io/thanos/blob/673614d9310f3f90fdb4585ca6201496ff92c697/pkg/cluster/cluster.go#L51-L64) For example; diff --git a/docs/service-discovery.md b/docs/service-discovery.md index 594393d375..62c5dde6ca 100644 --- a/docs/service-discovery.md +++ b/docs/service-discovery.md @@ -11,7 +11,7 @@ Service discovery has a vital place in Thanos components. It allows Thanos to di Currently places that uses Thanos SD: -* `Thanos Query` needs to know about [StoreAPI](https://github.com/improbable-eng/thanos/blob/d3fb337da94d11c78151504b1fccb1d7e036f394/pkg/store/storepb/rpc.proto#L14) servers in order to query metrics from them. +* `Thanos Query` needs to know about [StoreAPI](https://github.com/thanos-io/thanos/blob/d3fb337da94d11c78151504b1fccb1d7e036f394/pkg/store/storepb/rpc.proto#L14) servers in order to query metrics from them. * `Thanos Rule` needs to know about `QueryAPI` servers in order to evaluate recording and alerting rules. * (Only static option with DNS discovery): `Thanos Rule` needs to know about `Alertmanagers` HA replicas in order to send alerts. diff --git a/go.mod b/go.mod index 332bea2abd..9873a47487 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/improbable-eng/thanos +module github.com/thanos-io/thanos require ( cloud.google.com/go v0.34.0 @@ -15,7 +15,6 @@ require ( github.com/google/martian v2.1.0+incompatible // indirect github.com/googleapis/gax-go v2.0.2+incompatible // indirect github.com/gophercloud/gophercloud v0.0.0-20190301152420-fca40860790e - github.com/gopherjs/gopherjs v0.0.0-20181103185306-d547d1d9531e // indirect github.com/grpc-ecosystem/go-grpc-middleware v1.0.0 github.com/grpc-ecosystem/go-grpc-prometheus v0.0.0-20181025070259-68e3a13e4117 github.com/hashicorp/golang-lru v0.5.1 @@ -34,23 +33,18 @@ require ( github.com/pkg/errors v0.8.1 github.com/prometheus/client_golang v1.0.0 github.com/prometheus/common v0.6.0 - github.com/prometheus/procfs v0.0.3 // indirect github.com/prometheus/prometheus v2.9.2+incompatible github.com/prometheus/tsdb v0.8.0 github.com/uber-go/atomic v1.4.0 // indirect github.com/uber/jaeger-client-go v2.16.0+incompatible github.com/uber/jaeger-lib v2.0.0+incompatible go.uber.org/atomic v1.4.0 // indirect - golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4 // indirect - golang.org/x/net v0.0.0-20190628185345-da137c7871d7 // indirect golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421 golang.org/x/sync v0.0.0-20190423024810-112230192c58 - golang.org/x/sys v0.0.0-20190626221950-04f50cda93cb // indirect golang.org/x/text v0.3.2 google.golang.org/api v0.3.2 google.golang.org/grpc v1.19.1 gopkg.in/alecthomas/kingpin.v2 v2.2.6 gopkg.in/fsnotify.v1 v1.4.7 - gopkg.in/fsnotify/fsnotify.v1 v1.4.7 // indirect gopkg.in/yaml.v2 v2.2.2 ) diff --git a/go.sum b/go.sum index 2c6d553d8a..24b25203f3 100644 --- a/go.sum +++ b/go.sum @@ -108,8 +108,6 @@ github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c h1:964Od4U6p2jUkFxvCy github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/go-cmp v0.2.0 h1:+dTQ8DZQJz0Mb/HjFlkptS1FeQ4cWSnN941F8aEG4SQ= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= -github.com/google/go-cmp v0.3.0 h1:crn/baboCvb5fXaQ0IJ1SGTsTVrWpDsCWC8EGETZijY= -github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-querystring v1.0.0 h1:Xkwi/a1rcvNg1PPYe5vI8GbeBY/jrVuDX5ASuANWTrk= github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck= github.com/google/gofuzz v0.0.0-20150304233714-bbcb9da2d746 h1:M6d2zDTA4cKXT6OwFsJxlo5tWrAukj3KfvJ1zcBatnA= @@ -123,9 +121,8 @@ github.com/googleapis/gnostic v0.0.0-20180520015035-48a0ecefe2e4 h1:yxHFSapGMUoy github.com/googleapis/gnostic v0.0.0-20180520015035-48a0ecefe2e4/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY= github.com/gophercloud/gophercloud v0.0.0-20190301152420-fca40860790e h1:hQpY0g0UGsLKLDs8UJ6xpA2gNCkEdEbvxSPqLItXCpI= github.com/gophercloud/gophercloud v0.0.0-20190301152420-fca40860790e/go.mod h1:vxM41WHh5uqHVBMZHzuwNOHh8XEoIEcSTewFxm1c5g8= +github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 h1:EGx4pi6eqNxGaHF6qqu48+N2wcFQ5qg5FXgOdqsJ5d8= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= -github.com/gopherjs/gopherjs v0.0.0-20181103185306-d547d1d9531e h1:JKmoR8x90Iww1ks85zJ1lfDGgIiMDuIptTOhJq+zKyg= -github.com/gopherjs/gopherjs v0.0.0-20181103185306-d547d1d9531e/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg= github.com/gorilla/mux v1.6.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 h1:pdN6V1QBWetyv/0+wjACpqVH+eVULgEjkurDLq3goeM= @@ -285,9 +282,8 @@ github.com/prometheus/common v0.6.0/go.mod h1:eBmuwkDJBwy6iBfxCBob6t6dR6ENT/y+J+ github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1 h1:/K3IL0Z1quvmJ7X0A1AwNEK7CRkVK3YwfOU/QAL4WGg= github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= +github.com/prometheus/procfs v0.0.2 h1:6LJUbpNm42llc4HRCuvApCSWB/WfhuNo9K98Q9sNGfs= github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= -github.com/prometheus/procfs v0.0.3 h1:CTwfnzjQ+8dS6MhHHu4YswVAD99sL2wjPqP+VkURmKE= -github.com/prometheus/procfs v0.0.3/go.mod h1:4A/X28fw3Fc593LaREMrKMqOKvUAntwMDaekg4FpcdQ= github.com/prometheus/prometheus v2.9.2+incompatible h1:5QVnXpkSsbbG59TyZ99clRfaHQy2QuIlTv6dEgS66C4= github.com/prometheus/prometheus v2.9.2+incompatible/go.mod h1:vdLuLLM0uqhLSofrQ7Nev2b/rQUyZ+pkT3zF7LB/i1g= github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= @@ -341,8 +337,6 @@ golang.org/x/crypto v0.0.0-20190211182817-74369b46fc67/go.mod h1:6SG95UA2DQfeDnf golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190513172903-22d7a77e9e5f h1:R423Cnkcp5JABoeemiGEPlt9tHXFfw5kvc0yqlxRPWo= golang.org/x/crypto v0.0.0-20190513172903-22d7a77e9e5f/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4 h1:HuIa8hRrWRSrqYzx1qI49NNxhdi2PrY7gxVSq1JjLDc= -golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= @@ -361,9 +355,8 @@ golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190522155817-f3200d17e092 h1:4QSRKanuywn15aTZvI/mIDEgPQpswuFndXpOj3rKEco= golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= +golang.org/x/net v0.0.0-20190613194153-d28f0bde5980 h1:dfGZHvZk057jK2MCeWus/TowKpJ8y4AmooUzdBSR9GU= golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20190628185345-da137c7871d7 h1:rTIdg5QFRR7XCaK4LCjBiPbx8j4DQRpdYMnGn/bJUEU= -golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421 h1:Wo7BWFiOk0QRFMLYMqJGFMd9CgUAcGx7V+qEg/h5IBI= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -389,8 +382,6 @@ golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5h golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190422165155-953cdadca894 h1:Cz4ceDQGXuKRnVBDTS23GTn/pU5OE2C0WrNTOYK1Uuc= golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190626221950-04f50cda93cb h1:fgwFCsaw9buMuxNd6+DQfAuSFqbNiQZpcgJQAgJsK6k= -golang.org/x/sys v0.0.0-20190626221950-04f50cda93cb/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= @@ -423,9 +414,8 @@ gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= +gopkg.in/fsnotify/fsnotify.v1 v1.3.1 h1:2fkCHbPQZNYRAyRyIV9VX0bpRkxIorlQDiYRmufHnhA= gopkg.in/fsnotify/fsnotify.v1 v1.3.1/go.mod h1:Fyux9zXlo4rWoMSIzpn9fDAYjalPqJ/K1qJ27s+7ltE= -gopkg.in/fsnotify/fsnotify.v1 v1.4.7 h1:XNNYLJHt73EyYiCZi6+xjupS9CpvmiDgjPTAjrBlQbo= -gopkg.in/fsnotify/fsnotify.v1 v1.4.7/go.mod h1:Fyux9zXlo4rWoMSIzpn9fDAYjalPqJ/K1qJ27s+7ltE= gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc= gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= gopkg.in/ini.v1 v1.42.0 h1:7N3gPTt50s8GuLortA00n8AqRTk75qOP98+mTPpgzRk= diff --git a/pkg/alert/alert.go b/pkg/alert/alert.go index ca49e4f9b0..52bd880691 100644 --- a/pkg/alert/alert.go +++ b/pkg/alert/alert.go @@ -18,8 +18,8 @@ import ( "github.com/pkg/errors" "github.com/prometheus/client_golang/prometheus" - "github.com/improbable-eng/thanos/pkg/runutil" "github.com/prometheus/prometheus/pkg/labels" + "github.com/thanos-io/thanos/pkg/runutil" ) const ( @@ -203,7 +203,7 @@ func (q *Queue) Push(alerts []*Alert) { q.pushed.Add(float64(len(alerts))) // Attach external labels and drop excluded labels before sending. - // TODO(bwplotka): User proper relabelling with https://github.com/improbable-eng/thanos/issues/660 + // TODO(bwplotka): User proper relabelling with https://github.com/thanos-io/thanos/issues/660 for _, a := range alerts { lb := labels.NewBuilder(labels.Labels{}) for _, l := range a.Labels { @@ -309,7 +309,7 @@ func NewSender( } // Send an alert batch to all given Alertmanager URLs. -// TODO(bwplotka): https://github.com/improbable-eng/thanos/issues/660 +// TODO(bwplotka): https://github.com/thanos-io/thanos/issues/660 func (s *Sender) Send(ctx context.Context, alerts []*Alert) { if len(alerts) == 0 { return diff --git a/pkg/alert/alert_test.go b/pkg/alert/alert_test.go index ef09f11ec7..c2fcc8f91a 100644 --- a/pkg/alert/alert_test.go +++ b/pkg/alert/alert_test.go @@ -12,9 +12,9 @@ import ( "github.com/prometheus/prometheus/pkg/labels" - "github.com/improbable-eng/thanos/pkg/testutil" "github.com/pkg/errors" promtestutil "github.com/prometheus/client_golang/prometheus/testutil" + "github.com/thanos-io/thanos/pkg/testutil" ) func TestQueue_Push_Relabelled(t *testing.T) { diff --git a/pkg/block/block.go b/pkg/block/block.go index e68ab99c1f..96d6434924 100644 --- a/pkg/block/block.go +++ b/pkg/block/block.go @@ -10,15 +10,15 @@ import ( "path" "path/filepath" - "github.com/improbable-eng/thanos/pkg/block/metadata" + "github.com/thanos-io/thanos/pkg/block/metadata" "fmt" "github.com/go-kit/kit/log" - "github.com/improbable-eng/thanos/pkg/objstore" - "github.com/improbable-eng/thanos/pkg/runutil" "github.com/oklog/ulid" "github.com/pkg/errors" + "github.com/thanos-io/thanos/pkg/objstore" + "github.com/thanos-io/thanos/pkg/runutil" ) const ( diff --git a/pkg/block/index.go b/pkg/block/index.go index 562c465541..1354c91d5a 100644 --- a/pkg/block/index.go +++ b/pkg/block/index.go @@ -12,19 +12,19 @@ import ( "strings" "time" - "github.com/improbable-eng/thanos/pkg/block/metadata" + "github.com/thanos-io/thanos/pkg/block/metadata" "github.com/prometheus/tsdb/fileutil" "github.com/go-kit/kit/log" "github.com/go-kit/kit/log/level" - "github.com/improbable-eng/thanos/pkg/runutil" "github.com/oklog/ulid" "github.com/pkg/errors" "github.com/prometheus/tsdb" "github.com/prometheus/tsdb/chunks" "github.com/prometheus/tsdb/index" "github.com/prometheus/tsdb/labels" + "github.com/thanos-io/thanos/pkg/runutil" ) const ( diff --git a/pkg/block/index_test.go b/pkg/block/index_test.go index 36a21f3ea3..25604a949c 100644 --- a/pkg/block/index_test.go +++ b/pkg/block/index_test.go @@ -8,8 +8,8 @@ import ( "testing" "github.com/go-kit/kit/log" - "github.com/improbable-eng/thanos/pkg/testutil" "github.com/prometheus/tsdb/labels" + "github.com/thanos-io/thanos/pkg/testutil" ) func TestWriteReadIndexCache(t *testing.T) { diff --git a/pkg/block/metadata/meta.go b/pkg/block/metadata/meta.go index ed5ef8d185..3138f63b80 100644 --- a/pkg/block/metadata/meta.go +++ b/pkg/block/metadata/meta.go @@ -12,10 +12,10 @@ import ( "path/filepath" "github.com/go-kit/kit/log" - "github.com/improbable-eng/thanos/pkg/runutil" "github.com/pkg/errors" "github.com/prometheus/tsdb" "github.com/prometheus/tsdb/fileutil" + "github.com/thanos-io/thanos/pkg/runutil" ) type SourceType string diff --git a/pkg/compact/compact.go b/pkg/compact/compact.go index cb54302826..7a5391853d 100644 --- a/pkg/compact/compact.go +++ b/pkg/compact/compact.go @@ -13,16 +13,16 @@ import ( "github.com/go-kit/kit/log" "github.com/go-kit/kit/log/level" - "github.com/improbable-eng/thanos/pkg/block" - "github.com/improbable-eng/thanos/pkg/block/metadata" - "github.com/improbable-eng/thanos/pkg/compact/downsample" - "github.com/improbable-eng/thanos/pkg/objstore" "github.com/oklog/ulid" "github.com/pkg/errors" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/tsdb" terrors "github.com/prometheus/tsdb/errors" "github.com/prometheus/tsdb/labels" + "github.com/thanos-io/thanos/pkg/block" + "github.com/thanos-io/thanos/pkg/block/metadata" + "github.com/thanos-io/thanos/pkg/compact/downsample" + "github.com/thanos-io/thanos/pkg/objstore" ) type ResolutionLevel int64 @@ -265,7 +265,7 @@ func (c *Syncer) downloadMeta(ctx context.Context, id ulid.ULID) (*metadata.Meta // - repair created blocks // - compactor created blocks // NOTE: It is not safe to miss "old" block (even that it is newly created) in sync step. Compactor needs to aware of ALL old blocks. - // TODO(bplotka): https://github.com/improbable-eng/thanos/issues/377 + // TODO(bplotka): https://github.com/thanos-io/thanos/issues/377 if ulid.Now()-id.Time() < uint64(c.consistencyDelay/time.Millisecond) && meta.Thanos.Source != metadata.BucketRepairSource && meta.Thanos.Source != metadata.CompactorSource && diff --git a/pkg/compact/compact_e2e_test.go b/pkg/compact/compact_e2e_test.go index f58862c0ac..be4d9f7571 100644 --- a/pkg/compact/compact_e2e_test.go +++ b/pkg/compact/compact_e2e_test.go @@ -15,16 +15,16 @@ import ( "time" "github.com/go-kit/kit/log" - "github.com/improbable-eng/thanos/pkg/block" - "github.com/improbable-eng/thanos/pkg/block/metadata" - "github.com/improbable-eng/thanos/pkg/objstore" - "github.com/improbable-eng/thanos/pkg/objstore/objtesting" - "github.com/improbable-eng/thanos/pkg/testutil" "github.com/oklog/ulid" "github.com/pkg/errors" "github.com/prometheus/tsdb" "github.com/prometheus/tsdb/index" "github.com/prometheus/tsdb/labels" + "github.com/thanos-io/thanos/pkg/block" + "github.com/thanos-io/thanos/pkg/block/metadata" + "github.com/thanos-io/thanos/pkg/objstore" + "github.com/thanos-io/thanos/pkg/objstore/objtesting" + "github.com/thanos-io/thanos/pkg/testutil" ) func TestSyncer_SyncMetas_e2e(t *testing.T) { diff --git a/pkg/compact/compact_test.go b/pkg/compact/compact_test.go index 4639fff67a..4148f5a8dd 100644 --- a/pkg/compact/compact_test.go +++ b/pkg/compact/compact_test.go @@ -7,11 +7,11 @@ import ( "testing" "time" - "github.com/improbable-eng/thanos/pkg/objstore/inmem" - "github.com/improbable-eng/thanos/pkg/testutil" "github.com/oklog/ulid" "github.com/pkg/errors" terrors "github.com/prometheus/tsdb/errors" + "github.com/thanos-io/thanos/pkg/objstore/inmem" + "github.com/thanos-io/thanos/pkg/testutil" ) func TestHaltError(t *testing.T) { diff --git a/pkg/compact/downsample/aggr_test.go b/pkg/compact/downsample/aggr_test.go index 838d73fe7e..e26906d1e3 100644 --- a/pkg/compact/downsample/aggr_test.go +++ b/pkg/compact/downsample/aggr_test.go @@ -5,8 +5,8 @@ import ( "time" "github.com/fortytw2/leaktest" - "github.com/improbable-eng/thanos/pkg/testutil" "github.com/prometheus/tsdb/chunkenc" + "github.com/thanos-io/thanos/pkg/testutil" ) func TestAggrChunk(t *testing.T) { diff --git a/pkg/compact/downsample/downsample.go b/pkg/compact/downsample/downsample.go index 9a9fceced1..21b54101ef 100644 --- a/pkg/compact/downsample/downsample.go +++ b/pkg/compact/downsample/downsample.go @@ -8,8 +8,6 @@ import ( "time" "github.com/go-kit/kit/log" - "github.com/improbable-eng/thanos/pkg/block/metadata" - "github.com/improbable-eng/thanos/pkg/runutil" "github.com/oklog/ulid" "github.com/pkg/errors" "github.com/prometheus/prometheus/pkg/value" @@ -19,6 +17,8 @@ import ( tsdberrors "github.com/prometheus/tsdb/errors" "github.com/prometheus/tsdb/index" "github.com/prometheus/tsdb/labels" + "github.com/thanos-io/thanos/pkg/block/metadata" + "github.com/thanos-io/thanos/pkg/runutil" ) // Standard downsampling resolution levels in Thanos. diff --git a/pkg/compact/downsample/downsample_test.go b/pkg/compact/downsample/downsample_test.go index a93ed7c2e7..5640f47672 100644 --- a/pkg/compact/downsample/downsample_test.go +++ b/pkg/compact/downsample/downsample_test.go @@ -11,9 +11,6 @@ import ( "github.com/fortytw2/leaktest" "github.com/go-kit/kit/log" - "github.com/improbable-eng/thanos/pkg/block" - "github.com/improbable-eng/thanos/pkg/block/metadata" - "github.com/improbable-eng/thanos/pkg/testutil" "github.com/pkg/errors" "github.com/prometheus/prometheus/pkg/value" "github.com/prometheus/tsdb" @@ -21,6 +18,9 @@ import ( "github.com/prometheus/tsdb/chunks" "github.com/prometheus/tsdb/index" "github.com/prometheus/tsdb/labels" + "github.com/thanos-io/thanos/pkg/block" + "github.com/thanos-io/thanos/pkg/block/metadata" + "github.com/thanos-io/thanos/pkg/testutil" ) func TestExpandChunkIterator(t *testing.T) { diff --git a/pkg/compact/downsample/streamed_block_writer.go b/pkg/compact/downsample/streamed_block_writer.go index e6cf8c878e..9a1a5cfce0 100644 --- a/pkg/compact/downsample/streamed_block_writer.go +++ b/pkg/compact/downsample/streamed_block_writer.go @@ -6,9 +6,6 @@ import ( "github.com/go-kit/kit/log" "github.com/go-kit/kit/log/level" - "github.com/improbable-eng/thanos/pkg/block" - "github.com/improbable-eng/thanos/pkg/block/metadata" - "github.com/improbable-eng/thanos/pkg/runutil" "github.com/pkg/errors" "github.com/prometheus/tsdb" "github.com/prometheus/tsdb/chunks" @@ -16,6 +13,9 @@ import ( "github.com/prometheus/tsdb/fileutil" "github.com/prometheus/tsdb/index" "github.com/prometheus/tsdb/labels" + "github.com/thanos-io/thanos/pkg/block" + "github.com/thanos-io/thanos/pkg/block/metadata" + "github.com/thanos-io/thanos/pkg/runutil" ) type labelValues map[string]struct{} diff --git a/pkg/compact/retention.go b/pkg/compact/retention.go index a4348570bb..ddadd5afac 100644 --- a/pkg/compact/retention.go +++ b/pkg/compact/retention.go @@ -6,9 +6,9 @@ import ( "github.com/go-kit/kit/log" "github.com/go-kit/kit/log/level" - "github.com/improbable-eng/thanos/pkg/block" - "github.com/improbable-eng/thanos/pkg/objstore" "github.com/pkg/errors" + "github.com/thanos-io/thanos/pkg/block" + "github.com/thanos-io/thanos/pkg/objstore" ) // Apply removes blocks depending on the specified retentionByResolution based on blocks MaxTime. diff --git a/pkg/compact/retention_test.go b/pkg/compact/retention_test.go index b07bc97aad..7adb265dfe 100644 --- a/pkg/compact/retention_test.go +++ b/pkg/compact/retention_test.go @@ -9,13 +9,13 @@ import ( "time" "github.com/go-kit/kit/log" - "github.com/improbable-eng/thanos/pkg/block/metadata" - "github.com/improbable-eng/thanos/pkg/compact" - "github.com/improbable-eng/thanos/pkg/objstore" - "github.com/improbable-eng/thanos/pkg/objstore/inmem" - "github.com/improbable-eng/thanos/pkg/testutil" "github.com/oklog/ulid" "github.com/prometheus/tsdb" + "github.com/thanos-io/thanos/pkg/block/metadata" + "github.com/thanos-io/thanos/pkg/compact" + "github.com/thanos-io/thanos/pkg/objstore" + "github.com/thanos-io/thanos/pkg/objstore/inmem" + "github.com/thanos-io/thanos/pkg/testutil" ) func TestApplyRetentionPolicyByResolution(t *testing.T) { diff --git a/pkg/component/component.go b/pkg/component/component.go index df4f5c80ed..d00966fc2e 100644 --- a/pkg/component/component.go +++ b/pkg/component/component.go @@ -3,7 +3,7 @@ package component import ( "strings" - "github.com/improbable-eng/thanos/pkg/store/storepb" + "github.com/thanos-io/thanos/pkg/store/storepb" ) // Component is a generic component interface. diff --git a/pkg/discovery/dns/provider.go b/pkg/discovery/dns/provider.go index 76d358fe32..148143ea4d 100644 --- a/pkg/discovery/dns/provider.go +++ b/pkg/discovery/dns/provider.go @@ -8,8 +8,8 @@ import ( "github.com/go-kit/kit/log" "github.com/go-kit/kit/log/level" - "github.com/improbable-eng/thanos/pkg/discovery/dns/miekgdns" "github.com/prometheus/client_golang/prometheus" + "github.com/thanos-io/thanos/pkg/discovery/dns/miekgdns" ) // Provider is a stateful cache for asynchronous DNS resolutions. It provides a way to resolve addresses and obtain them. diff --git a/pkg/discovery/dns/provider_test.go b/pkg/discovery/dns/provider_test.go index 6589522b38..0483a023e5 100644 --- a/pkg/discovery/dns/provider_test.go +++ b/pkg/discovery/dns/provider_test.go @@ -8,7 +8,7 @@ import ( "github.com/pkg/errors" "github.com/go-kit/kit/log" - "github.com/improbable-eng/thanos/pkg/testutil" + "github.com/thanos-io/thanos/pkg/testutil" ) func TestProvider(t *testing.T) { diff --git a/pkg/discovery/dns/resolver_test.go b/pkg/discovery/dns/resolver_test.go index 2489d027a0..7209e031b9 100644 --- a/pkg/discovery/dns/resolver_test.go +++ b/pkg/discovery/dns/resolver_test.go @@ -6,8 +6,8 @@ import ( "sort" "testing" - "github.com/improbable-eng/thanos/pkg/testutil" "github.com/pkg/errors" + "github.com/thanos-io/thanos/pkg/testutil" ) type mockHostnameResolver struct { diff --git a/pkg/objstore/azure/azure.go b/pkg/objstore/azure/azure.go index 5e4d2595c1..1805fe8512 100644 --- a/pkg/objstore/azure/azure.go +++ b/pkg/objstore/azure/azure.go @@ -12,8 +12,8 @@ import ( blob "github.com/Azure/azure-storage-blob-go/azblob" "github.com/go-kit/kit/log" "github.com/go-kit/kit/log/level" - "github.com/improbable-eng/thanos/pkg/objstore" "github.com/pkg/errors" + "github.com/thanos-io/thanos/pkg/objstore" yaml "gopkg.in/yaml.v2" ) diff --git a/pkg/objstore/azure/azure_test.go b/pkg/objstore/azure/azure_test.go index 8ee09c8cdc..280be7fb98 100644 --- a/pkg/objstore/azure/azure_test.go +++ b/pkg/objstore/azure/azure_test.go @@ -3,7 +3,7 @@ package azure import ( "testing" - "github.com/improbable-eng/thanos/pkg/testutil" + "github.com/thanos-io/thanos/pkg/testutil" ) func TestConfig_validate(t *testing.T) { diff --git a/pkg/objstore/azure/helpers_test.go b/pkg/objstore/azure/helpers_test.go index 84d47f4711..b44ba5d32d 100644 --- a/pkg/objstore/azure/helpers_test.go +++ b/pkg/objstore/azure/helpers_test.go @@ -4,7 +4,7 @@ import ( "context" "testing" - "github.com/improbable-eng/thanos/pkg/testutil" + "github.com/thanos-io/thanos/pkg/testutil" ) func Test_getContainerURL(t *testing.T) { diff --git a/pkg/objstore/client/factory.go b/pkg/objstore/client/factory.go index 68537cd55d..2a4edc86b0 100644 --- a/pkg/objstore/client/factory.go +++ b/pkg/objstore/client/factory.go @@ -7,14 +7,14 @@ import ( "github.com/go-kit/kit/log" "github.com/go-kit/kit/log/level" - "github.com/improbable-eng/thanos/pkg/objstore" - "github.com/improbable-eng/thanos/pkg/objstore/azure" - "github.com/improbable-eng/thanos/pkg/objstore/cos" - "github.com/improbable-eng/thanos/pkg/objstore/gcs" - "github.com/improbable-eng/thanos/pkg/objstore/s3" - "github.com/improbable-eng/thanos/pkg/objstore/swift" "github.com/pkg/errors" "github.com/prometheus/client_golang/prometheus" + "github.com/thanos-io/thanos/pkg/objstore" + "github.com/thanos-io/thanos/pkg/objstore/azure" + "github.com/thanos-io/thanos/pkg/objstore/cos" + "github.com/thanos-io/thanos/pkg/objstore/gcs" + "github.com/thanos-io/thanos/pkg/objstore/s3" + "github.com/thanos-io/thanos/pkg/objstore/swift" yaml "gopkg.in/yaml.v2" ) diff --git a/pkg/objstore/cos/cos.go b/pkg/objstore/cos/cos.go index 946d4bd750..d348152cce 100644 --- a/pkg/objstore/cos/cos.go +++ b/pkg/objstore/cos/cos.go @@ -12,10 +12,10 @@ import ( "time" "github.com/go-kit/kit/log" - "github.com/improbable-eng/thanos/pkg/objstore" - "github.com/improbable-eng/thanos/pkg/runutil" cos "github.com/mozillazg/go-cos" "github.com/pkg/errors" + "github.com/thanos-io/thanos/pkg/objstore" + "github.com/thanos-io/thanos/pkg/runutil" yaml "gopkg.in/yaml.v2" ) diff --git a/pkg/objstore/gcs/gcs.go b/pkg/objstore/gcs/gcs.go index 9445e08f33..53baf1e4f7 100644 --- a/pkg/objstore/gcs/gcs.go +++ b/pkg/objstore/gcs/gcs.go @@ -13,9 +13,9 @@ import ( "cloud.google.com/go/storage" "github.com/go-kit/kit/log" - "github.com/improbable-eng/thanos/pkg/objstore" "github.com/pkg/errors" "github.com/prometheus/common/version" + "github.com/thanos-io/thanos/pkg/objstore" "golang.org/x/oauth2/google" "google.golang.org/api/iterator" "google.golang.org/api/option" diff --git a/pkg/objstore/inmem/inmem.go b/pkg/objstore/inmem/inmem.go index 29f95d7b8e..d9421319d0 100644 --- a/pkg/objstore/inmem/inmem.go +++ b/pkg/objstore/inmem/inmem.go @@ -9,8 +9,8 @@ import ( "io/ioutil" "strings" - "github.com/improbable-eng/thanos/pkg/objstore" "github.com/pkg/errors" + "github.com/thanos-io/thanos/pkg/objstore" ) var errNotFound = errors.New("inmem: object not found") diff --git a/pkg/objstore/objstore.go b/pkg/objstore/objstore.go index 81d52d7d45..79a443fa78 100644 --- a/pkg/objstore/objstore.go +++ b/pkg/objstore/objstore.go @@ -10,9 +10,9 @@ import ( "github.com/go-kit/kit/log" "github.com/go-kit/kit/log/level" - "github.com/improbable-eng/thanos/pkg/runutil" "github.com/pkg/errors" "github.com/prometheus/client_golang/prometheus" + "github.com/thanos-io/thanos/pkg/runutil" ) // Bucket provides read and write access to an object storage bucket. diff --git a/pkg/objstore/objtesting/acceptance_e2e_test.go b/pkg/objstore/objtesting/acceptance_e2e_test.go index c8902d2dde..73da5ed16c 100644 --- a/pkg/objstore/objtesting/acceptance_e2e_test.go +++ b/pkg/objstore/objtesting/acceptance_e2e_test.go @@ -7,8 +7,8 @@ import ( "strings" "testing" - "github.com/improbable-eng/thanos/pkg/objstore" - "github.com/improbable-eng/thanos/pkg/testutil" + "github.com/thanos-io/thanos/pkg/objstore" + "github.com/thanos-io/thanos/pkg/testutil" ) // TestObjStoreAcceptanceTest_e2e tests all known implementation against interface behaviour contract we agreed on. diff --git a/pkg/objstore/objtesting/foreach.go b/pkg/objstore/objtesting/foreach.go index b528271c1c..66dc47b24f 100644 --- a/pkg/objstore/objtesting/foreach.go +++ b/pkg/objstore/objtesting/foreach.go @@ -6,14 +6,14 @@ import ( "time" "github.com/fortytw2/leaktest" - "github.com/improbable-eng/thanos/pkg/objstore" - "github.com/improbable-eng/thanos/pkg/objstore/azure" - "github.com/improbable-eng/thanos/pkg/objstore/cos" - "github.com/improbable-eng/thanos/pkg/objstore/gcs" - "github.com/improbable-eng/thanos/pkg/objstore/inmem" - "github.com/improbable-eng/thanos/pkg/objstore/s3" - "github.com/improbable-eng/thanos/pkg/objstore/swift" - "github.com/improbable-eng/thanos/pkg/testutil" + "github.com/thanos-io/thanos/pkg/objstore" + "github.com/thanos-io/thanos/pkg/objstore/azure" + "github.com/thanos-io/thanos/pkg/objstore/cos" + "github.com/thanos-io/thanos/pkg/objstore/gcs" + "github.com/thanos-io/thanos/pkg/objstore/inmem" + "github.com/thanos-io/thanos/pkg/objstore/s3" + "github.com/thanos-io/thanos/pkg/objstore/swift" + "github.com/thanos-io/thanos/pkg/testutil" ) // ForeachStore runs given test using all available objstore implementations. diff --git a/pkg/objstore/s3/s3.go b/pkg/objstore/s3/s3.go index 6baa8914af..a0193fe8a5 100644 --- a/pkg/objstore/s3/s3.go +++ b/pkg/objstore/s3/s3.go @@ -18,14 +18,14 @@ import ( "github.com/go-kit/kit/log" "github.com/go-kit/kit/log/level" - "github.com/improbable-eng/thanos/pkg/objstore" - "github.com/improbable-eng/thanos/pkg/runutil" minio "github.com/minio/minio-go/v6" "github.com/minio/minio-go/v6/pkg/credentials" "github.com/minio/minio-go/v6/pkg/encrypt" "github.com/pkg/errors" "github.com/prometheus/common/model" "github.com/prometheus/common/version" + "github.com/thanos-io/thanos/pkg/objstore" + "github.com/thanos-io/thanos/pkg/runutil" yaml "gopkg.in/yaml.v2" ) @@ -298,7 +298,7 @@ func (b *Bucket) guessFileSize(name string, r io.Reader) int64 { // Upload the contents of the reader as an object into the bucket. func (b *Bucket) Upload(ctx context.Context, name string, r io.Reader) error { - // TODO(https://github.com/improbable-eng/thanos/issues/678): Remove guessing length when minio provider will support multipart upload without this. + // TODO(https://github.com/thanos-io/thanos/issues/678): Remove guessing length when minio provider will support multipart upload without this. fileSize := b.guessFileSize(name, r) if _, err := b.client.PutObjectWithContext( diff --git a/pkg/objstore/s3/s3_test.go b/pkg/objstore/s3/s3_test.go index 9f47f0c496..fe8ad3ff53 100644 --- a/pkg/objstore/s3/s3_test.go +++ b/pkg/objstore/s3/s3_test.go @@ -4,7 +4,7 @@ import ( "testing" "time" - "github.com/improbable-eng/thanos/pkg/testutil" + "github.com/thanos-io/thanos/pkg/testutil" ) func TestParseConfig(t *testing.T) { diff --git a/pkg/objstore/swift/swift.go b/pkg/objstore/swift/swift.go index 059435dab0..94dd2c66e4 100644 --- a/pkg/objstore/swift/swift.go +++ b/pkg/objstore/swift/swift.go @@ -17,8 +17,8 @@ import ( "github.com/gophercloud/gophercloud/openstack/objectstorage/v1/containers" "github.com/gophercloud/gophercloud/openstack/objectstorage/v1/objects" "github.com/gophercloud/gophercloud/pagination" - "github.com/improbable-eng/thanos/pkg/objstore" "github.com/pkg/errors" + "github.com/thanos-io/thanos/pkg/objstore" yaml "gopkg.in/yaml.v2" ) diff --git a/pkg/objstore/swift/swift_test.go b/pkg/objstore/swift/swift_test.go index ea12defd41..a45961683c 100644 --- a/pkg/objstore/swift/swift_test.go +++ b/pkg/objstore/swift/swift_test.go @@ -3,7 +3,7 @@ package swift import ( "testing" - "github.com/improbable-eng/thanos/pkg/testutil" + "github.com/thanos-io/thanos/pkg/testutil" ) func TestParseConfig(t *testing.T) { diff --git a/pkg/pool/pool_test.go b/pkg/pool/pool_test.go index e439ed8272..a27aca3af1 100644 --- a/pkg/pool/pool_test.go +++ b/pkg/pool/pool_test.go @@ -3,7 +3,7 @@ package pool import ( "testing" - "github.com/improbable-eng/thanos/pkg/testutil" + "github.com/thanos-io/thanos/pkg/testutil" ) func TestBytesPool(t *testing.T) { diff --git a/pkg/prober/prober.go b/pkg/prober/prober.go index 83e133e5fb..1bf6c32f40 100644 --- a/pkg/prober/prober.go +++ b/pkg/prober/prober.go @@ -10,8 +10,8 @@ import ( "github.com/go-kit/kit/log" "github.com/go-kit/kit/log/level" - "github.com/improbable-eng/thanos/pkg/component" "github.com/prometheus/common/route" + "github.com/thanos-io/thanos/pkg/component" ) const ( diff --git a/pkg/prober/prober_test.go b/pkg/prober/prober_test.go index 6165a47d90..b7e31f412c 100644 --- a/pkg/prober/prober_test.go +++ b/pkg/prober/prober_test.go @@ -10,11 +10,11 @@ import ( "time" "github.com/go-kit/kit/log" - "github.com/improbable-eng/thanos/pkg/runutil" - "github.com/improbable-eng/thanos/pkg/testutil" "github.com/oklog/run" "github.com/pkg/errors" "github.com/prometheus/common/route" + "github.com/thanos-io/thanos/pkg/runutil" + "github.com/thanos-io/thanos/pkg/testutil" ) func queryHTTPGetEndpoint(ctx context.Context, t *testing.T, logger log.Logger, url string) (*http.Response, error) { diff --git a/pkg/promclient/promclient.go b/pkg/promclient/promclient.go index 1da84ec4c0..a67ed041b9 100644 --- a/pkg/promclient/promclient.go +++ b/pkg/promclient/promclient.go @@ -23,15 +23,15 @@ import ( "github.com/go-kit/kit/log" "github.com/go-kit/kit/log/level" - "github.com/improbable-eng/thanos/pkg/runutil" - "github.com/improbable-eng/thanos/pkg/store/storepb" - "github.com/improbable-eng/thanos/pkg/tracing" "github.com/pkg/errors" "github.com/prometheus/common/model" promlabels "github.com/prometheus/prometheus/pkg/labels" "github.com/prometheus/prometheus/pkg/textparse" "github.com/prometheus/prometheus/promql" "github.com/prometheus/tsdb/labels" + "github.com/thanos-io/thanos/pkg/runutil" + "github.com/thanos-io/thanos/pkg/store/storepb" + "github.com/thanos-io/thanos/pkg/tracing" yaml "gopkg.in/yaml.v2" ) diff --git a/pkg/promclient/promclient_e2e_test.go b/pkg/promclient/promclient_e2e_test.go index 0f4929653e..d71cdd9468 100644 --- a/pkg/promclient/promclient_e2e_test.go +++ b/pkg/promclient/promclient_e2e_test.go @@ -11,12 +11,12 @@ import ( "time" "github.com/go-kit/kit/log" - "github.com/improbable-eng/thanos/pkg/runutil" - "github.com/improbable-eng/thanos/pkg/testutil" "github.com/oklog/ulid" "github.com/prometheus/common/model" "github.com/prometheus/prometheus/pkg/timestamp" "github.com/prometheus/tsdb/labels" + "github.com/thanos-io/thanos/pkg/runutil" + "github.com/thanos-io/thanos/pkg/testutil" ) func TestIsWALFileAccesible_e2e(t *testing.T) { diff --git a/pkg/query/api/v1.go b/pkg/query/api/v1.go index 8de227fbd3..7ec9e64f03 100644 --- a/pkg/query/api/v1.go +++ b/pkg/query/api/v1.go @@ -29,10 +29,6 @@ import ( "github.com/NYTimes/gziphandler" "github.com/go-kit/kit/log" - extpromhttp "github.com/improbable-eng/thanos/pkg/extprom/http" - "github.com/improbable-eng/thanos/pkg/query" - "github.com/improbable-eng/thanos/pkg/runutil" - "github.com/improbable-eng/thanos/pkg/tracing" opentracing "github.com/opentracing/opentracing-go" "github.com/pkg/errors" "github.com/prometheus/client_golang/prometheus" @@ -42,6 +38,10 @@ import ( "github.com/prometheus/prometheus/pkg/timestamp" "github.com/prometheus/prometheus/promql" "github.com/prometheus/prometheus/storage" + extpromhttp "github.com/thanos-io/thanos/pkg/extprom/http" + "github.com/thanos-io/thanos/pkg/query" + "github.com/thanos-io/thanos/pkg/runutil" + "github.com/thanos-io/thanos/pkg/tracing" ) type status string diff --git a/pkg/query/api/v1_test.go b/pkg/query/api/v1_test.go index afa6b24406..36fcf06644 100644 --- a/pkg/query/api/v1_test.go +++ b/pkg/query/api/v1_test.go @@ -30,10 +30,6 @@ import ( "time" "github.com/go-kit/kit/log" - "github.com/improbable-eng/thanos/pkg/compact" - extpromhttp "github.com/improbable-eng/thanos/pkg/extprom/http" - "github.com/improbable-eng/thanos/pkg/query" - "github.com/improbable-eng/thanos/pkg/testutil" opentracing "github.com/opentracing/opentracing-go" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/common/route" @@ -41,6 +37,10 @@ import ( "github.com/prometheus/prometheus/pkg/timestamp" "github.com/prometheus/prometheus/promql" "github.com/prometheus/prometheus/storage" + "github.com/thanos-io/thanos/pkg/compact" + extpromhttp "github.com/thanos-io/thanos/pkg/extprom/http" + "github.com/thanos-io/thanos/pkg/query" + "github.com/thanos-io/thanos/pkg/testutil" ) func testQueryableCreator(queryable storage.Queryable) query.QueryableCreator { diff --git a/pkg/query/iter.go b/pkg/query/iter.go index bc0b767db0..0f16185e17 100644 --- a/pkg/query/iter.go +++ b/pkg/query/iter.go @@ -4,12 +4,12 @@ import ( "math" "sort" - "github.com/improbable-eng/thanos/pkg/compact/downsample" - "github.com/improbable-eng/thanos/pkg/store/storepb" "github.com/pkg/errors" "github.com/prometheus/prometheus/pkg/labels" "github.com/prometheus/prometheus/storage" "github.com/prometheus/tsdb/chunkenc" + "github.com/thanos-io/thanos/pkg/compact/downsample" + "github.com/thanos-io/thanos/pkg/store/storepb" ) // promSeriesSet implements the SeriesSet interface of the Prometheus storage diff --git a/pkg/query/querier.go b/pkg/query/querier.go index ec396e7b34..df66401ff0 100644 --- a/pkg/query/querier.go +++ b/pkg/query/querier.go @@ -6,11 +6,11 @@ import ( "strings" "github.com/go-kit/kit/log" - "github.com/improbable-eng/thanos/pkg/store/storepb" - "github.com/improbable-eng/thanos/pkg/tracing" "github.com/pkg/errors" "github.com/prometheus/prometheus/pkg/labels" "github.com/prometheus/prometheus/storage" + "github.com/thanos-io/thanos/pkg/store/storepb" + "github.com/thanos-io/thanos/pkg/tracing" ) // WarningReporter allows to report warnings to frontend layer. diff --git a/pkg/query/querier_test.go b/pkg/query/querier_test.go index 0ae92c0dba..56c9411631 100644 --- a/pkg/query/querier_test.go +++ b/pkg/query/querier_test.go @@ -13,13 +13,13 @@ import ( "time" "github.com/fortytw2/leaktest" - "github.com/improbable-eng/thanos/pkg/store/storepb" - "github.com/improbable-eng/thanos/pkg/testutil" "github.com/pkg/errors" "github.com/prometheus/prometheus/pkg/labels" "github.com/prometheus/prometheus/promql" "github.com/prometheus/prometheus/storage" "github.com/prometheus/tsdb/chunkenc" + "github.com/thanos-io/thanos/pkg/store/storepb" + "github.com/thanos-io/thanos/pkg/testutil" ) func TestQueryableCreator_MaxResolution(t *testing.T) { diff --git a/pkg/query/storeset.go b/pkg/query/storeset.go index 2c7909fcb5..e6d9467702 100644 --- a/pkg/query/storeset.go +++ b/pkg/query/storeset.go @@ -10,13 +10,13 @@ import ( "github.com/go-kit/kit/log" "github.com/go-kit/kit/log/level" - "github.com/improbable-eng/thanos/pkg/component" - "github.com/improbable-eng/thanos/pkg/runutil" - "github.com/improbable-eng/thanos/pkg/store" - "github.com/improbable-eng/thanos/pkg/store/storepb" "github.com/pkg/errors" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/tsdb/labels" + "github.com/thanos-io/thanos/pkg/component" + "github.com/thanos-io/thanos/pkg/runutil" + "github.com/thanos-io/thanos/pkg/store" + "github.com/thanos-io/thanos/pkg/store/storepb" "google.golang.org/grpc" ) diff --git a/pkg/query/storeset_test.go b/pkg/query/storeset_test.go index b0bcef079e..4dd59b42b8 100644 --- a/pkg/query/storeset_test.go +++ b/pkg/query/storeset_test.go @@ -14,8 +14,8 @@ import ( "github.com/fortytw2/leaktest" "github.com/go-kit/kit/log" "github.com/go-kit/kit/log/level" - "github.com/improbable-eng/thanos/pkg/store/storepb" - "github.com/improbable-eng/thanos/pkg/testutil" + "github.com/thanos-io/thanos/pkg/store/storepb" + "github.com/thanos-io/thanos/pkg/testutil" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/pkg/receive/handler.go b/pkg/receive/handler.go index 1df14c42d9..5e16bdd3ba 100644 --- a/pkg/receive/handler.go +++ b/pkg/receive/handler.go @@ -15,8 +15,6 @@ import ( "github.com/go-kit/kit/log/level" "github.com/gogo/protobuf/proto" "github.com/golang/snappy" - "github.com/improbable-eng/thanos/pkg/runutil" - "github.com/improbable-eng/thanos/pkg/store/prompb" conntrack "github.com/mwitkow/go-conntrack" "github.com/opentracing-contrib/go-stdlib/nethttp" opentracing "github.com/opentracing/opentracing-go" @@ -26,6 +24,8 @@ import ( "github.com/prometheus/common/route" promtsdb "github.com/prometheus/prometheus/storage/tsdb" terrors "github.com/prometheus/tsdb/errors" + "github.com/thanos-io/thanos/pkg/runutil" + "github.com/thanos-io/thanos/pkg/store/prompb" ) // Options for the web Handler. diff --git a/pkg/receive/hashring.go b/pkg/receive/hashring.go index 66fbc82c8e..a2b4781330 100644 --- a/pkg/receive/hashring.go +++ b/pkg/receive/hashring.go @@ -7,7 +7,7 @@ import ( "sort" "sync" - "github.com/improbable-eng/thanos/pkg/store/prompb" + "github.com/thanos-io/thanos/pkg/store/prompb" "github.com/cespare/xxhash" ) diff --git a/pkg/receive/hashring_test.go b/pkg/receive/hashring_test.go index 71c49ea0d0..44fd621c3b 100644 --- a/pkg/receive/hashring_test.go +++ b/pkg/receive/hashring_test.go @@ -3,7 +3,7 @@ package receive import ( "testing" - "github.com/improbable-eng/thanos/pkg/store/prompb" + "github.com/thanos-io/thanos/pkg/store/prompb" ) func TestHash(t *testing.T) { diff --git a/pkg/receive/writer.go b/pkg/receive/writer.go index a4e6c1d7d2..d3f14216cf 100644 --- a/pkg/receive/writer.go +++ b/pkg/receive/writer.go @@ -2,8 +2,8 @@ package receive import ( "github.com/go-kit/kit/log" - "github.com/improbable-eng/thanos/pkg/store/prompb" "github.com/pkg/errors" + "github.com/thanos-io/thanos/pkg/store/prompb" "github.com/prometheus/prometheus/pkg/labels" "github.com/prometheus/prometheus/storage" diff --git a/pkg/reloader/example_test.go b/pkg/reloader/example_test.go index 7a1f8575ce..22dd361276 100644 --- a/pkg/reloader/example_test.go +++ b/pkg/reloader/example_test.go @@ -8,7 +8,7 @@ import ( "net/http" "net/url" - "github.com/improbable-eng/thanos/pkg/reloader" + "github.com/thanos-io/thanos/pkg/reloader" ) func ExampleReloader() { diff --git a/pkg/reloader/reloader.go b/pkg/reloader/reloader.go index 88b87a80bb..af42849286 100644 --- a/pkg/reloader/reloader.go +++ b/pkg/reloader/reloader.go @@ -68,7 +68,7 @@ import ( "github.com/fsnotify/fsnotify" "github.com/go-kit/kit/log" "github.com/go-kit/kit/log/level" - "github.com/improbable-eng/thanos/pkg/runutil" + "github.com/thanos-io/thanos/pkg/runutil" "github.com/pkg/errors" ) diff --git a/pkg/reloader/reloader_test.go b/pkg/reloader/reloader_test.go index 257e32aed2..95975ad73a 100644 --- a/pkg/reloader/reloader_test.go +++ b/pkg/reloader/reloader_test.go @@ -16,7 +16,7 @@ import ( "time" "github.com/fortytw2/leaktest" - "github.com/improbable-eng/thanos/pkg/testutil" + "github.com/thanos-io/thanos/pkg/testutil" ) func TestReloader_ConfigApply(t *testing.T) { diff --git a/pkg/rule/api/v1.go b/pkg/rule/api/v1.go index 558c38305c..b9eb84ddc0 100644 --- a/pkg/rule/api/v1.go +++ b/pkg/rule/api/v1.go @@ -7,15 +7,15 @@ import ( "github.com/NYTimes/gziphandler" "github.com/go-kit/kit/log" - extpromhttp "github.com/improbable-eng/thanos/pkg/extprom/http" - qapi "github.com/improbable-eng/thanos/pkg/query/api" - thanosrule "github.com/improbable-eng/thanos/pkg/rule" - "github.com/improbable-eng/thanos/pkg/store/storepb" - "github.com/improbable-eng/thanos/pkg/tracing" opentracing "github.com/opentracing/opentracing-go" "github.com/prometheus/common/route" "github.com/prometheus/prometheus/pkg/labels" "github.com/prometheus/prometheus/rules" + extpromhttp "github.com/thanos-io/thanos/pkg/extprom/http" + qapi "github.com/thanos-io/thanos/pkg/query/api" + thanosrule "github.com/thanos-io/thanos/pkg/rule" + "github.com/thanos-io/thanos/pkg/store/storepb" + "github.com/thanos-io/thanos/pkg/tracing" ) type API struct { diff --git a/pkg/rule/api/v1_test.go b/pkg/rule/api/v1_test.go index cd30377867..a556a952dd 100644 --- a/pkg/rule/api/v1_test.go +++ b/pkg/rule/api/v1_test.go @@ -11,13 +11,13 @@ import ( "time" "github.com/go-kit/kit/log" - qapi "github.com/improbable-eng/thanos/pkg/query/api" - thanosrule "github.com/improbable-eng/thanos/pkg/rule" "github.com/prometheus/common/route" "github.com/prometheus/prometheus/pkg/labels" "github.com/prometheus/prometheus/promql" "github.com/prometheus/prometheus/rules" "github.com/prometheus/prometheus/util/testutil" + qapi "github.com/thanos-io/thanos/pkg/query/api" + thanosrule "github.com/thanos-io/thanos/pkg/rule" ) type rulesRetrieverMock struct { diff --git a/pkg/rule/rule.go b/pkg/rule/rule.go index 43d7519da2..d338a5c7e6 100644 --- a/pkg/rule/rule.go +++ b/pkg/rule/rule.go @@ -9,11 +9,11 @@ import ( "strings" "time" - "github.com/improbable-eng/thanos/pkg/store/storepb" "github.com/pkg/errors" "github.com/prometheus/prometheus/pkg/rulefmt" "github.com/prometheus/prometheus/rules" tsdberrors "github.com/prometheus/tsdb/errors" + "github.com/thanos-io/thanos/pkg/store/storepb" yaml "gopkg.in/yaml.v2" ) diff --git a/pkg/rule/rule_test.go b/pkg/rule/rule_test.go index d469941f84..5353bb3503 100644 --- a/pkg/rule/rule_test.go +++ b/pkg/rule/rule_test.go @@ -10,10 +10,10 @@ import ( "time" "github.com/go-kit/kit/log" - "github.com/improbable-eng/thanos/pkg/store/storepb" - "github.com/improbable-eng/thanos/pkg/testutil" "github.com/prometheus/prometheus/pkg/rulefmt" "github.com/prometheus/prometheus/rules" + "github.com/thanos-io/thanos/pkg/store/storepb" + "github.com/thanos-io/thanos/pkg/testutil" yaml "gopkg.in/yaml.v2" ) diff --git a/pkg/runutil/example_test.go b/pkg/runutil/example_test.go index b6edc72728..cc6b859498 100644 --- a/pkg/runutil/example_test.go +++ b/pkg/runutil/example_test.go @@ -7,7 +7,7 @@ import ( "log" "time" - "github.com/improbable-eng/thanos/pkg/runutil" + "github.com/thanos-io/thanos/pkg/runutil" ) func ExampleRepeat() { diff --git a/pkg/shipper/shipper.go b/pkg/shipper/shipper.go index db05786b62..0011d90fdd 100644 --- a/pkg/shipper/shipper.go +++ b/pkg/shipper/shipper.go @@ -14,16 +14,16 @@ import ( "github.com/go-kit/kit/log" "github.com/go-kit/kit/log/level" - "github.com/improbable-eng/thanos/pkg/block" - "github.com/improbable-eng/thanos/pkg/block/metadata" - "github.com/improbable-eng/thanos/pkg/objstore" - "github.com/improbable-eng/thanos/pkg/runutil" "github.com/oklog/ulid" "github.com/pkg/errors" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/tsdb" "github.com/prometheus/tsdb/fileutil" "github.com/prometheus/tsdb/labels" + "github.com/thanos-io/thanos/pkg/block" + "github.com/thanos-io/thanos/pkg/block/metadata" + "github.com/thanos-io/thanos/pkg/objstore" + "github.com/thanos-io/thanos/pkg/runutil" ) type metrics struct { diff --git a/pkg/shipper/shipper_e2e_test.go b/pkg/shipper/shipper_e2e_test.go index cd2acb1fd2..cfd25f503e 100644 --- a/pkg/shipper/shipper_e2e_test.go +++ b/pkg/shipper/shipper_e2e_test.go @@ -12,18 +12,18 @@ import ( "testing" "time" - "github.com/improbable-eng/thanos/pkg/objstore/inmem" + "github.com/thanos-io/thanos/pkg/objstore/inmem" "github.com/go-kit/kit/log" - "github.com/improbable-eng/thanos/pkg/block" - "github.com/improbable-eng/thanos/pkg/block/metadata" - "github.com/improbable-eng/thanos/pkg/objstore" - "github.com/improbable-eng/thanos/pkg/objstore/objtesting" - "github.com/improbable-eng/thanos/pkg/testutil" "github.com/oklog/ulid" "github.com/prometheus/prometheus/pkg/timestamp" "github.com/prometheus/tsdb" "github.com/prometheus/tsdb/labels" + "github.com/thanos-io/thanos/pkg/block" + "github.com/thanos-io/thanos/pkg/block/metadata" + "github.com/thanos-io/thanos/pkg/objstore" + "github.com/thanos-io/thanos/pkg/objstore/objtesting" + "github.com/thanos-io/thanos/pkg/testutil" ) func TestShipper_SyncBlocks_e2e(t *testing.T) { diff --git a/pkg/shipper/shipper_test.go b/pkg/shipper/shipper_test.go index 81053640fd..7257441235 100644 --- a/pkg/shipper/shipper_test.go +++ b/pkg/shipper/shipper_test.go @@ -8,10 +8,10 @@ import ( "testing" "github.com/go-kit/kit/log" - "github.com/improbable-eng/thanos/pkg/block/metadata" - "github.com/improbable-eng/thanos/pkg/testutil" "github.com/oklog/ulid" "github.com/prometheus/tsdb" + "github.com/thanos-io/thanos/pkg/block/metadata" + "github.com/thanos-io/thanos/pkg/testutil" ) func TestShipperTimestamps(t *testing.T) { diff --git a/pkg/store/bucket.go b/pkg/store/bucket.go index c6db3ec81c..bf015ca647 100644 --- a/pkg/store/bucket.go +++ b/pkg/store/bucket.go @@ -18,17 +18,6 @@ import ( "github.com/go-kit/kit/log" "github.com/go-kit/kit/log/level" - "github.com/improbable-eng/thanos/pkg/block" - "github.com/improbable-eng/thanos/pkg/block/metadata" - "github.com/improbable-eng/thanos/pkg/compact/downsample" - "github.com/improbable-eng/thanos/pkg/component" - "github.com/improbable-eng/thanos/pkg/extprom" - "github.com/improbable-eng/thanos/pkg/objstore" - "github.com/improbable-eng/thanos/pkg/pool" - "github.com/improbable-eng/thanos/pkg/runutil" - "github.com/improbable-eng/thanos/pkg/store/storepb" - "github.com/improbable-eng/thanos/pkg/strutil" - "github.com/improbable-eng/thanos/pkg/tracing" "github.com/oklog/run" "github.com/oklog/ulid" "github.com/pkg/errors" @@ -38,6 +27,17 @@ import ( "github.com/prometheus/tsdb/fileutil" "github.com/prometheus/tsdb/index" "github.com/prometheus/tsdb/labels" + "github.com/thanos-io/thanos/pkg/block" + "github.com/thanos-io/thanos/pkg/block/metadata" + "github.com/thanos-io/thanos/pkg/compact/downsample" + "github.com/thanos-io/thanos/pkg/component" + "github.com/thanos-io/thanos/pkg/extprom" + "github.com/thanos-io/thanos/pkg/objstore" + "github.com/thanos-io/thanos/pkg/pool" + "github.com/thanos-io/thanos/pkg/runutil" + "github.com/thanos-io/thanos/pkg/store/storepb" + "github.com/thanos-io/thanos/pkg/strutil" + "github.com/thanos-io/thanos/pkg/tracing" "golang.org/x/sync/errgroup" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" @@ -1340,7 +1340,7 @@ func (p *postingGroup) Postings() index.Postings { for i, posting := range p.postings { if posting == nil { - // This should not happen. Debug for https://github.com/improbable-eng/thanos/issues/874. + // This should not happen. Debug for https://github.com/thanos-io/thanos/issues/874. return index.ErrPostings(errors.Errorf("at least one of %d postings is nil for %s. It was never fetched.", i, p.keys[i])) } } diff --git a/pkg/store/bucket_e2e_test.go b/pkg/store/bucket_e2e_test.go index c0fc42b97c..2185e0d161 100644 --- a/pkg/store/bucket_e2e_test.go +++ b/pkg/store/bucket_e2e_test.go @@ -12,17 +12,17 @@ import ( "github.com/oklog/ulid" "github.com/go-kit/kit/log" - "github.com/improbable-eng/thanos/pkg/block" - "github.com/improbable-eng/thanos/pkg/block/metadata" - "github.com/improbable-eng/thanos/pkg/objstore" - "github.com/improbable-eng/thanos/pkg/objstore/objtesting" - "github.com/improbable-eng/thanos/pkg/runutil" - storecache "github.com/improbable-eng/thanos/pkg/store/cache" - "github.com/improbable-eng/thanos/pkg/store/storepb" - "github.com/improbable-eng/thanos/pkg/testutil" "github.com/pkg/errors" "github.com/prometheus/prometheus/pkg/timestamp" "github.com/prometheus/tsdb/labels" + "github.com/thanos-io/thanos/pkg/block" + "github.com/thanos-io/thanos/pkg/block/metadata" + "github.com/thanos-io/thanos/pkg/objstore" + "github.com/thanos-io/thanos/pkg/objstore/objtesting" + "github.com/thanos-io/thanos/pkg/runutil" + storecache "github.com/thanos-io/thanos/pkg/store/cache" + "github.com/thanos-io/thanos/pkg/store/storepb" + "github.com/thanos-io/thanos/pkg/testutil" ) type noopCache struct{} @@ -335,7 +335,7 @@ func testBucketStore_e2e(t testing.TB, ctx context.Context, s *storeSuite) { {{Name: "a", Value: "2"}, {Name: "c", Value: "2"}, {Name: "ext2", Value: "value2"}}, }, }, - // Regression https://github.com/improbable-eng/thanos/issues/833. + // Regression https://github.com/thanos-io/thanos/issues/833. // Problem: Matcher that was selecting NO series, was ignored instead of passed as emptyPosting to Intersect. { req: &storepb.SeriesRequest{ @@ -410,7 +410,7 @@ func (g naivePartitioner) Partition(length int, rng func(int) (uint64, uint64)) // Naive partitioner splits the array equally (it does not combine anything). // This tests if our, sometimes concurrent, fetches for different parts works. -// Regression test against: https://github.com/improbable-eng/thanos/issues/829 +// Regression test against: https://github.com/thanos-io/thanos/issues/829 func TestBucketStore_ManyParts_e2e(t *testing.T) { objtesting.ForeachStore(t, func(t testing.TB, bkt objstore.Bucket) { ctx, cancel := context.WithCancel(context.Background()) diff --git a/pkg/store/bucket_test.go b/pkg/store/bucket_test.go index 8a08bbd33f..0a85f7cc49 100644 --- a/pkg/store/bucket_test.go +++ b/pkg/store/bucket_test.go @@ -8,15 +8,15 @@ import ( "time" "github.com/fortytw2/leaktest" - "github.com/improbable-eng/thanos/pkg/block/metadata" - "github.com/improbable-eng/thanos/pkg/compact/downsample" - "github.com/improbable-eng/thanos/pkg/store/storepb" - "github.com/improbable-eng/thanos/pkg/testutil" "github.com/leanovate/gopter" "github.com/leanovate/gopter/gen" "github.com/leanovate/gopter/prop" "github.com/oklog/ulid" "github.com/prometheus/tsdb/labels" + "github.com/thanos-io/thanos/pkg/block/metadata" + "github.com/thanos-io/thanos/pkg/compact/downsample" + "github.com/thanos-io/thanos/pkg/store/storepb" + "github.com/thanos-io/thanos/pkg/testutil" ) func TestBucketBlock_Property(t *testing.T) { diff --git a/pkg/store/cache/cache_test.go b/pkg/store/cache/cache_test.go index d07ccda0e0..961e4c6876 100644 --- a/pkg/store/cache/cache_test.go +++ b/pkg/store/cache/cache_test.go @@ -11,11 +11,11 @@ import ( "github.com/fortytw2/leaktest" "github.com/go-kit/kit/log" "github.com/hashicorp/golang-lru/simplelru" - "github.com/improbable-eng/thanos/pkg/testutil" "github.com/oklog/ulid" "github.com/prometheus/client_golang/prometheus" promtest "github.com/prometheus/client_golang/prometheus/testutil" "github.com/prometheus/tsdb/labels" + "github.com/thanos-io/thanos/pkg/testutil" ) func TestIndexCache_AvoidsDeadlock(t *testing.T) { diff --git a/pkg/store/matchers.go b/pkg/store/matchers.go index 052de29dca..b492481568 100644 --- a/pkg/store/matchers.go +++ b/pkg/store/matchers.go @@ -1,9 +1,9 @@ package store import ( - "github.com/improbable-eng/thanos/pkg/store/storepb" "github.com/pkg/errors" "github.com/prometheus/tsdb/labels" + "github.com/thanos-io/thanos/pkg/store/storepb" ) func translateMatcher(m storepb.LabelMatcher) (labels.Matcher, error) { diff --git a/pkg/store/prometheus.go b/pkg/store/prometheus.go index 1753592a57..d3fdaf5de4 100644 --- a/pkg/store/prometheus.go +++ b/pkg/store/prometheus.go @@ -18,14 +18,14 @@ import ( "github.com/go-kit/kit/log/level" "github.com/gogo/protobuf/proto" "github.com/golang/snappy" - "github.com/improbable-eng/thanos/pkg/component" - "github.com/improbable-eng/thanos/pkg/runutil" - "github.com/improbable-eng/thanos/pkg/store/prompb" - "github.com/improbable-eng/thanos/pkg/store/storepb" - "github.com/improbable-eng/thanos/pkg/tracing" "github.com/pkg/errors" "github.com/prometheus/tsdb/chunkenc" "github.com/prometheus/tsdb/labels" + "github.com/thanos-io/thanos/pkg/component" + "github.com/thanos-io/thanos/pkg/runutil" + "github.com/thanos-io/thanos/pkg/store/prompb" + "github.com/thanos-io/thanos/pkg/store/storepb" + "github.com/thanos-io/thanos/pkg/tracing" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) @@ -175,12 +175,12 @@ func (p *PrometheusStore) Series(r *storepb.SeriesRequest, s storepb.Store_Serie lset := p.translateAndExtendLabels(e.Labels, externalLabels) if len(e.Samples) == 0 { - // As found in https://github.com/improbable-eng/thanos/issues/381 + // As found in https://github.com/thanos-io/thanos/issues/381 // Prometheus can give us completely empty time series. Ignore these with log until we figure out that // this is expected from Prometheus perspective. level.Warn(p.logger).Log( "msg", - "found timeseries without any chunk. See https://github.com/improbable-eng/thanos/issues/381 for details", + "found timeseries without any chunk. See https://github.com/thanos-io/thanos/issues/381 for details", "lset", fmt.Sprintf("%v", lset), ) @@ -189,7 +189,7 @@ func (p *PrometheusStore) Series(r *storepb.SeriesRequest, s storepb.Store_Serie // XOR encoding supports a max size of 2^16 - 1 samples, so we need // to chunk all samples into groups of no more than 2^16 - 1 - // See: https://github.com/improbable-eng/thanos/pull/718 + // See: https://github.com/thanos-io/thanos/pull/718 aggregatedChunks, err := p.chunkSamples(e, math.MaxUint16) if err != nil { return err diff --git a/pkg/store/prometheus_test.go b/pkg/store/prometheus_test.go index 386e4a48db..c74b64efbc 100644 --- a/pkg/store/prometheus_test.go +++ b/pkg/store/prometheus_test.go @@ -9,20 +9,20 @@ import ( "time" "github.com/fortytw2/leaktest" - "github.com/improbable-eng/thanos/pkg/component" - "github.com/improbable-eng/thanos/pkg/store/storepb" - "github.com/improbable-eng/thanos/pkg/testutil" "github.com/prometheus/prometheus/pkg/timestamp" "github.com/prometheus/tsdb" "github.com/prometheus/tsdb/chunkenc" "github.com/prometheus/tsdb/labels" + "github.com/thanos-io/thanos/pkg/component" + "github.com/thanos-io/thanos/pkg/store/storepb" + "github.com/thanos-io/thanos/pkg/testutil" ) func TestPrometheusStore_Series_e2e(t *testing.T) { testPrometheusStoreSeriesE2e(t, "") } -// Regression test for https://github.com/improbable-eng/thanos/issues/478. +// Regression test for https://github.com/thanos-io/thanos/issues/478. func TestPrometheusStore_Series_promOnPath_e2e(t *testing.T) { testPrometheusStoreSeriesE2e(t, "/prometheus/sub/path") } @@ -345,7 +345,7 @@ func testSeries_SplitSamplesIntoChunksWithMaxSizeOfUint16_e2e(t *testing.T, appe testutil.Equals(t, 5, chunk.NumSamples()) } -// Regression test for https://github.com/improbable-eng/thanos/issues/396. +// Regression test for https://github.com/thanos-io/thanos/issues/396. func TestPrometheusStore_Series_SplitSamplesIntoChunksWithMaxSizeOfUint16_e2e(t *testing.T) { defer leaktest.CheckTimeout(t, 10*time.Second)() diff --git a/pkg/store/proxy.go b/pkg/store/proxy.go index bcb470743f..e2986033b1 100644 --- a/pkg/store/proxy.go +++ b/pkg/store/proxy.go @@ -13,13 +13,13 @@ import ( "github.com/go-kit/kit/log" "github.com/go-kit/kit/log/level" grpc_opentracing "github.com/grpc-ecosystem/go-grpc-middleware/tracing/opentracing" - "github.com/improbable-eng/thanos/pkg/component" - "github.com/improbable-eng/thanos/pkg/store/storepb" - "github.com/improbable-eng/thanos/pkg/strutil" - "github.com/improbable-eng/thanos/pkg/tracing" "github.com/opentracing/opentracing-go" "github.com/pkg/errors" "github.com/prometheus/tsdb/labels" + "github.com/thanos-io/thanos/pkg/component" + "github.com/thanos-io/thanos/pkg/store/storepb" + "github.com/thanos-io/thanos/pkg/strutil" + "github.com/thanos-io/thanos/pkg/tracing" "golang.org/x/sync/errgroup" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/pkg/store/proxy_test.go b/pkg/store/proxy_test.go index 872cec293a..728bfb0c41 100644 --- a/pkg/store/proxy_test.go +++ b/pkg/store/proxy_test.go @@ -11,13 +11,13 @@ import ( "github.com/fortytw2/leaktest" "github.com/gogo/protobuf/proto" - "github.com/improbable-eng/thanos/pkg/component" - "github.com/improbable-eng/thanos/pkg/store/storepb" - "github.com/improbable-eng/thanos/pkg/testutil" "github.com/pkg/errors" "github.com/prometheus/prometheus/pkg/labels" "github.com/prometheus/tsdb/chunkenc" tlabels "github.com/prometheus/tsdb/labels" + "github.com/thanos-io/thanos/pkg/component" + "github.com/thanos-io/thanos/pkg/store/storepb" + "github.com/thanos-io/thanos/pkg/testutil" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/pkg/store/tsdb.go b/pkg/store/tsdb.go index 80cf75b9a5..9a18628577 100644 --- a/pkg/store/tsdb.go +++ b/pkg/store/tsdb.go @@ -6,14 +6,14 @@ import ( "sort" "github.com/go-kit/kit/log" - "github.com/improbable-eng/thanos/pkg/component" - "github.com/improbable-eng/thanos/pkg/runutil" - "github.com/improbable-eng/thanos/pkg/store/storepb" "github.com/pkg/errors" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/tsdb" "github.com/prometheus/tsdb/chunkenc" "github.com/prometheus/tsdb/labels" + "github.com/thanos-io/thanos/pkg/component" + "github.com/thanos-io/thanos/pkg/runutil" + "github.com/thanos-io/thanos/pkg/store/storepb" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) @@ -113,7 +113,7 @@ func (s *TSDBStore) Series(r *storepb.SeriesRequest, srv storepb.Store_SeriesSer // limited benefit for now. // NOTE: XOR encoding supports a max size of 2^16 - 1 samples, so we need // to chunk all samples into groups of no more than 2^16 - 1 - // See: https://github.com/improbable-eng/thanos/pull/1038 + // See: https://github.com/thanos-io/thanos/pull/1038 c, err := s.encodeChunks(series.Iterator(), math.MaxUint16) if err != nil { return status.Errorf(codes.Internal, "encode chunk: %s", err) diff --git a/pkg/store/tsdb_test.go b/pkg/store/tsdb_test.go index 8ef65a999f..4f3576aee2 100644 --- a/pkg/store/tsdb_test.go +++ b/pkg/store/tsdb_test.go @@ -7,10 +7,10 @@ import ( "time" "github.com/fortytw2/leaktest" - "github.com/improbable-eng/thanos/pkg/component" - "github.com/improbable-eng/thanos/pkg/store/storepb" - "github.com/improbable-eng/thanos/pkg/testutil" "github.com/prometheus/tsdb/labels" + "github.com/thanos-io/thanos/pkg/component" + "github.com/thanos-io/thanos/pkg/store/storepb" + "github.com/thanos-io/thanos/pkg/testutil" ) func TestTSDBStore_Info(t *testing.T) { @@ -34,7 +34,7 @@ func TestTSDBStore_Info(t *testing.T) { testutil.Equals(t, int64(math.MaxInt64), resp.MaxTime) } -// Regression test for https://github.com/improbable-eng/thanos/issues/1038. +// Regression test for https://github.com/thanos-io/thanos/issues/1038. func TestTSDBStore_Series_SplitSamplesIntoChunksWithMaxSizeOfUint16_e2e(t *testing.T) { defer leaktest.CheckTimeout(t, 10*time.Second)() diff --git a/pkg/testutil/prometheus.go b/pkg/testutil/prometheus.go index 13895f2584..b0766b5964 100644 --- a/pkg/testutil/prometheus.go +++ b/pkg/testutil/prometheus.go @@ -17,13 +17,13 @@ import ( "time" "github.com/go-kit/kit/log" - "github.com/improbable-eng/thanos/pkg/block/metadata" - "github.com/improbable-eng/thanos/pkg/runutil" "github.com/oklog/ulid" "github.com/pkg/errors" "github.com/prometheus/tsdb" "github.com/prometheus/tsdb/labels" "github.com/prometheus/tsdb/testutil" + "github.com/thanos-io/thanos/pkg/block/metadata" + "github.com/thanos-io/thanos/pkg/runutil" "golang.org/x/sync/errgroup" ) diff --git a/pkg/tracing/client/factory.go b/pkg/tracing/client/factory.go index 30af8dc43f..da9fec4a19 100644 --- a/pkg/tracing/client/factory.go +++ b/pkg/tracing/client/factory.go @@ -5,8 +5,8 @@ import ( "io" "strings" - "github.com/improbable-eng/thanos/pkg/tracing/jaeger" - "github.com/improbable-eng/thanos/pkg/tracing/stackdriver" + "github.com/thanos-io/thanos/pkg/tracing/jaeger" + "github.com/thanos-io/thanos/pkg/tracing/stackdriver" "github.com/go-kit/kit/log" "github.com/go-kit/kit/log/level" diff --git a/pkg/tracing/jaeger/jaeger.go b/pkg/tracing/jaeger/jaeger.go index 7e31229d38..73c65baf32 100644 --- a/pkg/tracing/jaeger/jaeger.go +++ b/pkg/tracing/jaeger/jaeger.go @@ -5,7 +5,7 @@ import ( "fmt" "io" - "github.com/improbable-eng/thanos/pkg/tracing" + "github.com/thanos-io/thanos/pkg/tracing" "github.com/go-kit/kit/log" "github.com/go-kit/kit/log/level" diff --git a/pkg/tracing/stackdriver/tracer.go b/pkg/tracing/stackdriver/tracer.go index 6664af62a0..d3167f0907 100644 --- a/pkg/tracing/stackdriver/tracer.go +++ b/pkg/tracing/stackdriver/tracer.go @@ -9,11 +9,11 @@ import ( trace "cloud.google.com/go/trace/apiv1" "github.com/go-kit/kit/log" "github.com/go-kit/kit/log/level" - "github.com/improbable-eng/thanos/pkg/tracing" gcloudtracer "github.com/lovoo/gcloud-opentracing" "github.com/opentracing/basictracer-go" "github.com/opentracing/opentracing-go" "github.com/prometheus/common/version" + "github.com/thanos-io/thanos/pkg/tracing" ) type tracer struct { diff --git a/pkg/tracing/stackdriver/tracer_test.go b/pkg/tracing/stackdriver/tracer_test.go index 7232e5ac26..c8fb379ff8 100644 --- a/pkg/tracing/stackdriver/tracer_test.go +++ b/pkg/tracing/stackdriver/tracer_test.go @@ -8,8 +8,8 @@ import ( "testing" "time" - "github.com/improbable-eng/thanos/pkg/testutil" - "github.com/improbable-eng/thanos/pkg/tracing" + "github.com/thanos-io/thanos/pkg/testutil" + "github.com/thanos-io/thanos/pkg/tracing" "github.com/fortytw2/leaktest" "github.com/opentracing/basictracer-go" diff --git a/pkg/ui/bucket.go b/pkg/ui/bucket.go index 28159cdd25..aeab8361b0 100644 --- a/pkg/ui/bucket.go +++ b/pkg/ui/bucket.go @@ -6,8 +6,8 @@ import ( "time" "github.com/go-kit/kit/log" - extpromhttp "github.com/improbable-eng/thanos/pkg/extprom/http" "github.com/prometheus/common/route" + extpromhttp "github.com/thanos-io/thanos/pkg/extprom/http" ) // Bucket is a web UI representing state of buckets as a timeline. diff --git a/pkg/ui/query.go b/pkg/ui/query.go index 13c731b5ed..e318cc55e5 100644 --- a/pkg/ui/query.go +++ b/pkg/ui/query.go @@ -10,12 +10,12 @@ import ( "time" "github.com/go-kit/kit/log" - "github.com/improbable-eng/thanos/pkg/component" - extpromhttp "github.com/improbable-eng/thanos/pkg/extprom/http" - "github.com/improbable-eng/thanos/pkg/query" "github.com/prometheus/common/model" "github.com/prometheus/common/route" "github.com/prometheus/common/version" + "github.com/thanos-io/thanos/pkg/component" + extpromhttp "github.com/thanos-io/thanos/pkg/extprom/http" + "github.com/thanos-io/thanos/pkg/query" ) type Query struct { diff --git a/pkg/ui/rule.go b/pkg/ui/rule.go index 5e1735287e..1de472866a 100644 --- a/pkg/ui/rule.go +++ b/pkg/ui/rule.go @@ -11,11 +11,11 @@ import ( "time" "github.com/go-kit/kit/log" - extpromhttp "github.com/improbable-eng/thanos/pkg/extprom/http" - thanosrule "github.com/improbable-eng/thanos/pkg/rule" - "github.com/improbable-eng/thanos/pkg/store/storepb" "github.com/prometheus/common/route" "github.com/prometheus/prometheus/rules" + extpromhttp "github.com/thanos-io/thanos/pkg/extprom/http" + thanosrule "github.com/thanos-io/thanos/pkg/rule" + "github.com/thanos-io/thanos/pkg/store/storepb" ) type Rule struct { diff --git a/pkg/verifier/duplicated_compaction.go b/pkg/verifier/duplicated_compaction.go index 6aa7710670..3cd33a0d20 100644 --- a/pkg/verifier/duplicated_compaction.go +++ b/pkg/verifier/duplicated_compaction.go @@ -10,15 +10,15 @@ import ( "github.com/go-kit/kit/log" "github.com/go-kit/kit/log/level" - "github.com/improbable-eng/thanos/pkg/objstore" "github.com/oklog/ulid" "github.com/pkg/errors" "github.com/prometheus/tsdb" + "github.com/thanos-io/thanos/pkg/objstore" ) const DuplicatedCompactionIssueID = "duplicated_compaction" -// DuplicatedCompactionIssue was a bug fixed in https://github.com/improbable-eng/thanos/commit/94e26c63e52ba45b713fd998638d0e7b2492664f. +// DuplicatedCompactionIssue was a bug fixed in https://github.com/thanos-io/thanos/commit/94e26c63e52ba45b713fd998638d0e7b2492664f. // Bug resulted in source block not being removed immediately after compaction, so we were compacting again and again same sources // until sync-delay passes. // The expected print of this are same overlapped blocks with exactly the same sources, time ranges and stats. diff --git a/pkg/verifier/duplicated_compaction_test.go b/pkg/verifier/duplicated_compaction_test.go index 82906a6149..d1cb8e4a6c 100644 --- a/pkg/verifier/duplicated_compaction_test.go +++ b/pkg/verifier/duplicated_compaction_test.go @@ -3,9 +3,9 @@ package verifier import ( "testing" - "github.com/improbable-eng/thanos/pkg/testutil" "github.com/oklog/ulid" "github.com/prometheus/tsdb" + "github.com/thanos-io/thanos/pkg/testutil" ) func TestDuplicatedBlocks(t *testing.T) { diff --git a/pkg/verifier/index_issue.go b/pkg/verifier/index_issue.go index 9be9b7f6a7..a25e8e181e 100644 --- a/pkg/verifier/index_issue.go +++ b/pkg/verifier/index_issue.go @@ -8,14 +8,14 @@ import ( "path" "path/filepath" - "github.com/improbable-eng/thanos/pkg/block/metadata" + "github.com/thanos-io/thanos/pkg/block/metadata" "github.com/go-kit/kit/log" "github.com/go-kit/kit/log/level" - "github.com/improbable-eng/thanos/pkg/block" - "github.com/improbable-eng/thanos/pkg/objstore" "github.com/oklog/ulid" "github.com/pkg/errors" + "github.com/thanos-io/thanos/pkg/block" + "github.com/thanos-io/thanos/pkg/objstore" ) const IndexIssueID = "index_issue" diff --git a/pkg/verifier/overlapped_blocks.go b/pkg/verifier/overlapped_blocks.go index af28fccb0c..869e4d6a68 100644 --- a/pkg/verifier/overlapped_blocks.go +++ b/pkg/verifier/overlapped_blocks.go @@ -6,12 +6,12 @@ import ( "github.com/go-kit/kit/log" "github.com/go-kit/kit/log/level" - "github.com/improbable-eng/thanos/pkg/block" - "github.com/improbable-eng/thanos/pkg/compact" - "github.com/improbable-eng/thanos/pkg/objstore" "github.com/oklog/ulid" "github.com/pkg/errors" "github.com/prometheus/tsdb" + "github.com/thanos-io/thanos/pkg/block" + "github.com/thanos-io/thanos/pkg/compact" + "github.com/thanos-io/thanos/pkg/objstore" ) const OverlappedBlocksIssueID = "overlapped_blocks" diff --git a/pkg/verifier/safe_delete.go b/pkg/verifier/safe_delete.go index a14e7e9238..f4b8d9a48b 100644 --- a/pkg/verifier/safe_delete.go +++ b/pkg/verifier/safe_delete.go @@ -9,10 +9,10 @@ import ( "github.com/go-kit/kit/log" "github.com/go-kit/kit/log/level" - "github.com/improbable-eng/thanos/pkg/block" - "github.com/improbable-eng/thanos/pkg/objstore" "github.com/oklog/ulid" "github.com/pkg/errors" + "github.com/thanos-io/thanos/pkg/block" + "github.com/thanos-io/thanos/pkg/objstore" ) // TSDBBlockExistsInBucket checks to see if a given TSDB block ID exists in a diff --git a/pkg/verifier/verify.go b/pkg/verifier/verify.go index d50f23904e..048bf8a588 100644 --- a/pkg/verifier/verify.go +++ b/pkg/verifier/verify.go @@ -5,9 +5,9 @@ import ( "github.com/go-kit/kit/log" "github.com/go-kit/kit/log/level" - "github.com/improbable-eng/thanos/pkg/objstore" "github.com/oklog/ulid" "github.com/pkg/errors" + "github.com/thanos-io/thanos/pkg/objstore" ) // Issue is an function that does verification and repair only if repair arg is true. diff --git a/scripts/bucketcfggen/main.go b/scripts/bucketcfggen/main.go index e53db6e3b3..72fa0a361d 100644 --- a/scripts/bucketcfggen/main.go +++ b/scripts/bucketcfggen/main.go @@ -11,13 +11,13 @@ import ( "github.com/fatih/structtag" "github.com/go-kit/kit/log" "github.com/go-kit/kit/log/level" - "github.com/improbable-eng/thanos/pkg/objstore/azure" - "github.com/improbable-eng/thanos/pkg/objstore/client" - "github.com/improbable-eng/thanos/pkg/objstore/cos" - "github.com/improbable-eng/thanos/pkg/objstore/gcs" - "github.com/improbable-eng/thanos/pkg/objstore/s3" - "github.com/improbable-eng/thanos/pkg/objstore/swift" "github.com/pkg/errors" + "github.com/thanos-io/thanos/pkg/objstore/azure" + "github.com/thanos-io/thanos/pkg/objstore/client" + "github.com/thanos-io/thanos/pkg/objstore/cos" + "github.com/thanos-io/thanos/pkg/objstore/gcs" + "github.com/thanos-io/thanos/pkg/objstore/s3" + "github.com/thanos-io/thanos/pkg/objstore/swift" kingpin "gopkg.in/alecthomas/kingpin.v2" yaml "gopkg.in/yaml.v2" ) diff --git a/test/e2e/query_test.go b/test/e2e/query_test.go index 90e095bc9d..8afd8e6ccd 100644 --- a/test/e2e/query_test.go +++ b/test/e2e/query_test.go @@ -9,11 +9,11 @@ import ( "time" "github.com/go-kit/kit/log" - "github.com/improbable-eng/thanos/pkg/promclient" - "github.com/improbable-eng/thanos/pkg/runutil" - "github.com/improbable-eng/thanos/pkg/testutil" "github.com/pkg/errors" "github.com/prometheus/common/model" + "github.com/thanos-io/thanos/pkg/promclient" + "github.com/thanos-io/thanos/pkg/runutil" + "github.com/thanos-io/thanos/pkg/testutil" ) type testConfig struct { diff --git a/test/e2e/receive_test.go b/test/e2e/receive_test.go index be3708de4c..a513649e5c 100644 --- a/test/e2e/receive_test.go +++ b/test/e2e/receive_test.go @@ -5,11 +5,11 @@ import ( "testing" "time" - "github.com/improbable-eng/thanos/pkg/promclient" - "github.com/improbable-eng/thanos/pkg/runutil" - "github.com/improbable-eng/thanos/pkg/testutil" "github.com/pkg/errors" "github.com/prometheus/common/model" + "github.com/thanos-io/thanos/pkg/promclient" + "github.com/thanos-io/thanos/pkg/runutil" + "github.com/thanos-io/thanos/pkg/testutil" ) var ( diff --git a/test/e2e/rule_test.go b/test/e2e/rule_test.go index ba1526506f..01294b071c 100644 --- a/test/e2e/rule_test.go +++ b/test/e2e/rule_test.go @@ -13,14 +13,14 @@ import ( "testing" "time" - "github.com/improbable-eng/thanos/pkg/promclient" - "github.com/improbable-eng/thanos/pkg/runutil" - "github.com/improbable-eng/thanos/pkg/store/storepb" - "github.com/improbable-eng/thanos/pkg/testutil" "github.com/pkg/errors" "github.com/prometheus/common/model" "github.com/prometheus/prometheus/pkg/labels" "github.com/prometheus/prometheus/pkg/timestamp" + "github.com/thanos-io/thanos/pkg/promclient" + "github.com/thanos-io/thanos/pkg/runutil" + "github.com/thanos-io/thanos/pkg/store/storepb" + "github.com/thanos-io/thanos/pkg/testutil" ) const ( diff --git a/test/e2e/spinup_test.go b/test/e2e/spinup_test.go index 96f3f2dae7..41fe0665b4 100644 --- a/test/e2e/spinup_test.go +++ b/test/e2e/spinup_test.go @@ -15,12 +15,12 @@ import ( "testing" "time" - "github.com/improbable-eng/thanos/pkg/objstore/s3" - "github.com/improbable-eng/thanos/pkg/runutil" - "github.com/improbable-eng/thanos/pkg/store/storepb" - "github.com/improbable-eng/thanos/pkg/testutil" "github.com/oklog/run" "github.com/pkg/errors" + "github.com/thanos-io/thanos/pkg/objstore/s3" + "github.com/thanos-io/thanos/pkg/runutil" + "github.com/thanos-io/thanos/pkg/store/storepb" + "github.com/thanos-io/thanos/pkg/testutil" "google.golang.org/grpc" ) diff --git a/test/e2e/store_gateway_test.go b/test/e2e/store_gateway_test.go index 13ff56864b..514e003d0e 100644 --- a/test/e2e/store_gateway_test.go +++ b/test/e2e/store_gateway_test.go @@ -9,16 +9,16 @@ import ( "time" "github.com/go-kit/kit/log" - "github.com/improbable-eng/thanos/pkg/objstore" - "github.com/improbable-eng/thanos/pkg/objstore/client" - "github.com/improbable-eng/thanos/pkg/objstore/s3" - "github.com/improbable-eng/thanos/pkg/promclient" - "github.com/improbable-eng/thanos/pkg/runutil" - "github.com/improbable-eng/thanos/pkg/testutil" "github.com/pkg/errors" "github.com/prometheus/common/model" "github.com/prometheus/prometheus/pkg/timestamp" "github.com/prometheus/tsdb/labels" + "github.com/thanos-io/thanos/pkg/objstore" + "github.com/thanos-io/thanos/pkg/objstore/client" + "github.com/thanos-io/thanos/pkg/objstore/s3" + "github.com/thanos-io/thanos/pkg/promclient" + "github.com/thanos-io/thanos/pkg/runutil" + "github.com/thanos-io/thanos/pkg/testutil" yaml "gopkg.in/yaml.v2" ) diff --git a/tutorials/kubernetes-demo/blockgen/main_test.go b/tutorials/kubernetes-demo/blockgen/main_test.go index 006050e6f4..a574057387 100644 --- a/tutorials/kubernetes-demo/blockgen/main_test.go +++ b/tutorials/kubernetes-demo/blockgen/main_test.go @@ -4,7 +4,7 @@ import ( "testing" "time" - "github.com/improbable-eng/thanos/pkg/testutil" + "github.com/thanos-io/thanos/pkg/testutil" ) func TestCounterGen(t *testing.T) {