Skip to content

Commit

Permalink
Merge branch 'master' into thanos_io
Browse files Browse the repository at this point in the history
* master:
  Fix typos (thanos-io#1350)
  pool: add pool raciness tests, fix p.usedTotal house-keeping (thanos-io#1340)
  runutil: add Exhaust* fns, initial users (thanos-io#1302)
  Further docs rename to new org; Improved docker login. (thanos-io#1344)
  Moved CI to thanos-io org and docker image to quay.io/thanos/thanos (thanos-io#1342)
  thanos-io (thanos-io#1343)
  website: migrate to new Github Org (thanos-io#1341)
  • Loading branch information
paulfantom committed Jul 26, 2019
2 parents be7bbdc + f6992f7 commit e91224f
Show file tree
Hide file tree
Showing 137 changed files with 653 additions and 551 deletions.
14 changes: 7 additions & 7 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ jobs:
docker:
# Available from https://hub.docker.com/r/circleci/golang/
- image: circleci/golang:1.12.5
working_directory: /go/src/github.com/improbable-eng/thanos
working_directory: /go/src/github.com/thanos-io/thanos
environment:
GO111MODULE: 'on'
GOBIN: "/go/bin"
Expand All @@ -19,7 +19,7 @@ jobs:
# require credentials. Env variables that sets up these tests will work only for these kind of PRs.
command: |
if ! [ -z ${GCP_PROJECT} ]; then
echo $GOOGLE_APPLICATION_CREDENTIALS_CONTENT > /go/src/github.com/improbable-eng/thanos/circleci-gcs-creds.json
echo $GOOGLE_APPLICATION_CREDENTIALS_CONTENT > $GOOGLE_APPLICATION_CREDENTIALS
echo "Awesome! GCS integration tests are enabled."
fi
- run: make check-go-mod
Expand Down Expand Up @@ -48,7 +48,7 @@ jobs:
# Cross build is needed for publish_release but needs to be done outside of docker.
cross_build:
machine: true
working_directory: /home/circleci/.go_workspace/src/github.com/improbable-eng/thanos
working_directory: /home/circleci/.go_workspace/src/github.com/thanos-io/thanos
environment:
GOBIN: "/home/circleci/.go_workspace/go/bin"
steps:
Expand All @@ -63,7 +63,7 @@ jobs:
docker:
# Available from https://hub.docker.com/r/circleci/golang/
- image: circleci/golang:1.12.5
working_directory: /go/src/github.com/improbable-eng/thanos
working_directory: /go/src/github.com/thanos-io/thanos
environment:
GOBIN: "/go/bin"
steps:
Expand All @@ -75,14 +75,14 @@ jobs:
- run: ln -s .build/linux-amd64/thanos thanos
- run: make docker
- run: docker run thanos --help
- run: docker login -u="${DOCKER_USERNAME}" -p="${DOCKER_PASSWORD}"
- run: echo "${QUAY_PASSWORD}" | docker login -u="${QUAY_USERNAME}" quay.io --password-stdin
- run: make docker-push

publish_release:
docker:
# Available from https://hub.docker.com/r/circleci/golang/
- image: circleci/golang:1.12.5
working_directory: /go/src/github.com/improbable-eng/thanos
working_directory: /go/src/github.com/thanos-io/thanos
environment:
GOBIN: "/go/bin"
steps:
Expand All @@ -98,7 +98,7 @@ jobs:
- run: ln -s .build/linux-amd64/thanos thanos
- run: make docker
- run: docker run thanos --help
- run: docker login -u="${DOCKER_USERNAME}" -p="${DOCKER_PASSWORD}"
- run: echo "${QUAY_PASSWORD}" | docker login -u="${QUAY_USERNAME}" quay.io --password-stdin
- run: make docker-push DOCKER_IMAGE_TAG=$CIRCLE_TAG

workflows:
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ about what components it touches e.g "query:" or ".*:"
-->

<!--
In case of issues related to exact bucket implementation, please ping corresponded maintainer from list here: https://github.com/improbable-eng/thanos/blob/master/docs/storage.md
In case of issues related to exact bucket implementation, please ping corresponded maintainer from list here: https://github.com/thanos-io/thanos/blob/master/docs/storage.md
-->

**Thanos, Prometheus and Golang version used**
Expand Down
2 changes: 1 addition & 1 deletion .promu.yml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
208 changes: 105 additions & 103 deletions CHANGELOG.md

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,13 @@ Adding large new features and components to Thanos should be done by first creat

1. Read [getting started docs](docs/getting-started.md) and prepare Thanos.
2. Familiarize yourself with [Makefile](Makefile) commands like `format`, `build`, `proto` and `test`.
3. Fork improbable-eng/thanos.git and start development from your own fork. Here are sample steps to setup your development environment:
3. Fork thanos-io/thanos.git and start development from your own fork. Here are sample steps to setup your development environment:
```console
$ mkdir -p $GOPATH/src/github.com/improbable-eng
$ cd $GOPATH/src/github.com/improbable-eng
$ mkdir -p $GOPATH/src/github.com/thanos-io
$ cd $GOPATH/src/github.com/thanos-io
$ git clone https://github.com/<your_github_id>/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
Expand Down Expand Up @@ -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

Expand Down
6 changes: 3 additions & 3 deletions Dockerfile.multi-stage
Original file line number Diff line number Diff line change
@@ -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

Expand All @@ -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" ]
2 changes: 1 addition & 1 deletion MAINTAINERS.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ Please reach any of the maintainer on slack or email if you want to help as well

### Triage labels

To improve navigating through issues and PRs we introduce various [labels](https://github.com/improbable-eng/thanos/issues/labels). Part of triaging process for Triage and Maintainers
To improve navigating through issues and PRs we introduce various [labels](https://github.com/thanos-io/thanos/issues/labels). Part of triaging process for Triage and Maintainers
is to adjust those labels if needed manual. The `Prow` system can automate a portion of this in future.

The main labels are:
Expand Down
23 changes: 12 additions & 11 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
PREFIX ?= $(shell pwd)
FILES_TO_FMT ?= $(shell find . -path ./vendor -prune -o -name '*.go' -print)

DOCKER_IMAGE_NAME ?= thanos
DOCKER_IMAGE_TAG ?= $(subst /,-,$(shell git rev-parse --abbrev-ref HEAD))-$(shell date +%Y-%m-%d)-$(shell git rev-parse --short HEAD)
Expand All @@ -16,6 +17,8 @@ EMBEDMD ?= $(GOBIN)/embedmd-$(EMBEDMD_VERSION)
EMBEDMD_VERSION ?= 97c13d6e41602fc6e397eb51c45f38069371a969
LICHE ?= $(GOBIN)/liche-$(LICHE_VERSION)
LICHE_VERSION ?= 2a2e6e56f6c615c17b2e116669c4cdb31b5453f3
GOIMPORTS ?= $(GOBIN)/goimports-$(GOIMPORTS_VERSION)
GOIMPORTS_VERSION ?= 9d4d845e86f14303813298ede731a971dd65b593
PROMU ?= $(GOBIN)/promu-$(PROMU_VERSION)
PROMU_VERSION ?= 9583e5a6448f97c6294dca72dd1d173e28f8d4a4
PROTOC ?= $(GOBIN)/protoc-$(PROTOC_VERSION)
Expand All @@ -38,9 +41,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
Expand Down Expand Up @@ -130,12 +133,12 @@ docker-multi-stage:
@echo ">> building docker image '${DOCKER_IMAGE_NAME}' with Dockerfile.multi-stage"
@docker build -f Dockerfile.multi-stage -t "${DOCKER_IMAGE_NAME}" .

# docker-push pushes docker image build under `${DOCKER_IMAGE_NAME}` to improbable/"$(DOCKER_IMAGE_NAME):$(DOCKER_IMAGE_TAG)"
# docker-push pushes docker image build under `${DOCKER_IMAGE_NAME}` to quay.io/thanos/"$(DOCKER_IMAGE_NAME):$(DOCKER_IMAGE_TAG)"
.PHONY: docker-push
docker-push:
@echo ">> pushing image"
@docker tag "${DOCKER_IMAGE_NAME}" improbable/"$(DOCKER_IMAGE_NAME):$(DOCKER_IMAGE_TAG)"
@docker push improbable/"$(DOCKER_IMAGE_NAME):$(DOCKER_IMAGE_TAG)"
@docker tag "${DOCKER_IMAGE_NAME}" quay.io/thanos/"$(DOCKER_IMAGE_NAME):$(DOCKER_IMAGE_TAG)"
@docker push quay.io/thanos/"$(DOCKER_IMAGE_NAME):$(DOCKER_IMAGE_TAG)"

# docs regenerates flags in docs for all thanos commands.
.PHONY: docs
Expand All @@ -150,13 +153,10 @@ check-docs: $(EMBEDMD) $(LICHE) build
@$(LICHE) --exclude "cloud.tencent.com" --document-root . *.md

# format formats the code (including imports format).
# # NOTE: format requires deps to not remove imports that are used, just not resolved.
# # This is not encoded, because it is often used in IDE onSave logic.
.PHONY: format
format: check-git $(GOLANGCILINT)
format: $(GOIMPORTS)
@echo ">> formatting code"
@$(GOLANGCILINT) run --disable-all -E goimports ./...

@$(GOIMPORTS) -w $(FILES_TO_FMT)

# proto generates golang files from Thanos proto files.
.PHONY: proto
Expand All @@ -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))
Expand Down Expand Up @@ -221,6 +221,7 @@ web: web-pre-process $(HUGO)
.PHONY: lint
lint: check-git $(GOLANGCILINT)
@echo ">> linting all of the Go files"
@$(GOLANGCILINT) run --disable-all -E goimports ./...
@$(GOLANGCILINT) run ./...

.PHONY: web-serve
Expand Down
15 changes: 7 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
<p align="center"><img src="docs/img/Thanos-logo_fullmedium.png" alt="Thanos Logo"></p>

[![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/)
[![CircleCI](https://circleci.com/gh/thanos-io/thanos.svg?style=svg)](https://circleci.com/gh/thanos-io/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
Expand Down Expand Up @@ -34,7 +33,7 @@ Concretely the aims of the project are:
* [Design](https://thanos.io/design.md/)
* [Prom Meetup Slides](https://www.slideshare.net/BartomiejPotka/thanos-global-durable-prometheus-monitoring)
* [Introduction blog post](https://improbable.io/games/blog/thanos-prometheus-at-scale)
* [Benchmarks](https://github.com/improbable-eng/thanos/tree/master/benchmark)
* [Benchmarks](https://github.com/thanos-io/thanos/tree/master/benchmark)
* [Proposals](docs/proposals)
* [Integrations](docs/integrations.md)

Expand Down Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion benchmark/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions benchmark/README.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# Thanosbench
A series of benchmarking/stress test tools for [thanos](https://github.com/improbable-eng/thanos).
A series of benchmarking/stress test tools for [thanos](https://github.com/thanos-io/thanos).

## Installation
1. Fetch thanosbench `go get github.com/improbable-eng/thanosbench`
1. Fetch thanosbench `go get github.com/thanos-io/thanosbench`
1. Install thanosbench with `make`
1. Create cloud resources for the load test k8s cluster.
* `cd terraform`
Expand Down
2 changes: 1 addition & 1 deletion benchmark/cmd/loadgen/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -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())
Expand Down
2 changes: 1 addition & 1 deletion benchmark/cmd/thanosbench/responsiveness.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ 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/pkg/errors"
"github.com/thanos-io/thanos/benchmark/pkg/tsdb"
"google.golang.org/api/iterator"
"k8s.io/client-go/kubernetes"
"k8s.io/client-go/tools/clientcmd"
Expand Down
2 changes: 1 addition & 1 deletion benchmark/go.mod
Original file line number Diff line number Diff line change
@@ -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
Expand Down
16 changes: 8 additions & 8 deletions cmd/thanos/bucket.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion cmd/thanos/check_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
18 changes: 9 additions & 9 deletions cmd/thanos/compact.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down Expand Up @@ -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()
Expand Down Expand Up @@ -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
Expand Down
16 changes: 8 additions & 8 deletions cmd/thanos/downsample.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,21 +11,21 @@ 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"
"github.com/pkg/errors"
"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"
)

Expand Down
Loading

0 comments on commit e91224f

Please sign in to comment.