Switch imports (grafana#1038)

* Remove leftover build.BAZEL files * Add test-exporter to .gitignore * Rename weaveworks/cortex to cortexproject/cortex everywhere Signed-off-by: Chris Marchbanks <csmarchbanks@gmail.com>
cyriltovena · Oct 2, 2018 · 614411a · 614411a
1 parent e7bd7c7
commit 614411a
Show file tree

Hide file tree

Showing 46 changed files with 92 additions and 92 deletions.
diff --git a/aws/aws_autoscaling.go b/aws/aws_autoscaling.go
@@ -10,9 +10,9 @@ import (
 	"github.com/go-kit/kit/log/level"
 	"github.com/prometheus/client_golang/prometheus"
 
+	"github.com/cortexproject/cortex/pkg/chunk"
+	"github.com/cortexproject/cortex/pkg/util"
 	"github.com/weaveworks/common/instrument"
-	"github.com/weaveworks/cortex/pkg/chunk"
-	"github.com/weaveworks/cortex/pkg/util"
 )
 
 const (

diff --git a/aws/dynamodb_table_client.go b/aws/dynamodb_table_client.go
@@ -10,9 +10,9 @@ import (
 	"github.com/go-kit/kit/log/level"
 	"golang.org/x/time/rate"
 
+	"github.com/cortexproject/cortex/pkg/chunk"
+	"github.com/cortexproject/cortex/pkg/util"
 	"github.com/weaveworks/common/instrument"
-	"github.com/weaveworks/cortex/pkg/chunk"
-	"github.com/weaveworks/cortex/pkg/util"
 )
 
 // Pluggable auto-scaler implementation

diff --git a/aws/dynamodb_table_client_test.go b/aws/dynamodb_table_client_test.go
@@ -14,8 +14,8 @@ import (
 	"github.com/stretchr/testify/require"
 	"github.com/weaveworks/common/mtime"
 
-	"github.com/weaveworks/cortex/pkg/chunk"
-	"github.com/weaveworks/cortex/pkg/util"
+	"github.com/cortexproject/cortex/pkg/chunk"
+	"github.com/cortexproject/cortex/pkg/util"
 )
 
 const (

diff --git a/aws/fixtures.go b/aws/fixtures.go
@@ -4,10 +4,10 @@ import (
 	"fmt"
 	"time"
 
+	"github.com/cortexproject/cortex/pkg/chunk"
+	"github.com/cortexproject/cortex/pkg/chunk/testutils"
+	"github.com/cortexproject/cortex/pkg/util"
 	"github.com/prometheus/common/model"
-	"github.com/weaveworks/cortex/pkg/chunk"
-	"github.com/weaveworks/cortex/pkg/chunk/testutils"
-	"github.com/weaveworks/cortex/pkg/util"
 )
 
 type fixture struct {

diff --git a/aws/metrics_autoscaling.go b/aws/metrics_autoscaling.go
@@ -13,8 +13,8 @@ import (
 	"github.com/prometheus/common/model"
 	"github.com/weaveworks/common/mtime"
 
-	"github.com/weaveworks/cortex/pkg/chunk"
-	"github.com/weaveworks/cortex/pkg/util"
+	"github.com/cortexproject/cortex/pkg/chunk"
+	"github.com/cortexproject/cortex/pkg/util"
 )
 
 const (

diff --git a/aws/metrics_autoscaling_test.go b/aws/metrics_autoscaling_test.go
@@ -10,7 +10,7 @@ import (
 	promV1 "github.com/prometheus/client_golang/api/prometheus/v1"
 	"github.com/prometheus/common/model"
 
-	"github.com/weaveworks/cortex/pkg/chunk"
+	"github.com/cortexproject/cortex/pkg/chunk"
 )
 
 func TestTableManagerMetricsAutoScaling(t *testing.T) {

diff --git a/aws/mock.go b/aws/mock.go
@@ -16,8 +16,8 @@ import (
 	"github.com/aws/aws-sdk-go/service/dynamodb/dynamodbiface"
 	"github.com/aws/aws-sdk-go/service/s3"
 	"github.com/aws/aws-sdk-go/service/s3/s3iface"
+	"github.com/cortexproject/cortex/pkg/util"
 	"github.com/go-kit/kit/log/level"
-	"github.com/weaveworks/cortex/pkg/util"
 )
 
 const arnPrefix = "arn:"

diff --git a/aws/storage_client.go b/aws/storage_client.go
@@ -26,12 +26,12 @@ import (
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/common/model"
 
+	"github.com/cortexproject/cortex/pkg/chunk"
+	chunk_util "github.com/cortexproject/cortex/pkg/chunk/util"
+	"github.com/cortexproject/cortex/pkg/util"
 	awscommon "github.com/weaveworks/common/aws"
 	"github.com/weaveworks/common/instrument"
 	"github.com/weaveworks/common/user"
-	"github.com/weaveworks/cortex/pkg/chunk"
-	chunk_util "github.com/weaveworks/cortex/pkg/chunk/util"
-	"github.com/weaveworks/cortex/pkg/util"
 )
 
 const (

diff --git a/aws/storage_client_test.go b/aws/storage_client_test.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/weaveworks/cortex/pkg/chunk/testutils"
+	"github.com/cortexproject/cortex/pkg/chunk/testutils"
 )
 
 const (

diff --git a/cache/background_test.go b/cache/background_test.go
@@ -3,7 +3,7 @@ package cache_test
 import (
 	"testing"
 
-	"github.com/weaveworks/cortex/pkg/chunk/cache"
+	"github.com/cortexproject/cortex/pkg/chunk/cache"
 )
 
 func TestBackground(t *testing.T) {

diff --git a/cache/cache_test.go b/cache/cache_test.go
@@ -10,11 +10,11 @@ import (
 	"testing"
 	"time"
 
+	"github.com/cortexproject/cortex/pkg/chunk"
+	"github.com/cortexproject/cortex/pkg/chunk/cache"
+	prom_chunk "github.com/cortexproject/cortex/pkg/prom1/storage/local/chunk"
 	"github.com/prometheus/common/model"
 	"github.com/stretchr/testify/require"
-	"github.com/weaveworks/cortex/pkg/chunk"
-	"github.com/weaveworks/cortex/pkg/chunk/cache"
-	prom_chunk "github.com/weaveworks/cortex/pkg/prom1/storage/local/chunk"
 )
 
 const userID = "1"

diff --git a/cache/diskcache.go b/cache/diskcache.go
@@ -16,7 +16,7 @@ import (
 	"github.com/prometheus/tsdb/fileutil"
 	"golang.org/x/sys/unix"
 
-	"github.com/weaveworks/cortex/pkg/util"
+	"github.com/cortexproject/cortex/pkg/util"
 )
 
 // TODO: in the future we could cuckoo hash or linear probe.

diff --git a/cache/memcached.go b/cache/memcached.go
@@ -9,12 +9,12 @@ import (
 	"time"
 
 	"github.com/bradfitz/gomemcache/memcache"
+	"github.com/cortexproject/cortex/pkg/util"
 	"github.com/go-kit/kit/log/level"
 	opentracing "github.com/opentracing/opentracing-go"
 	otlog "github.com/opentracing/opentracing-go/log"
 	"github.com/prometheus/client_golang/prometheus"
 	instr "github.com/weaveworks/common/instrument"
-	"github.com/weaveworks/cortex/pkg/util"
 )
 
 var (

diff --git a/cache/memcached_client.go b/cache/memcached_client.go
@@ -9,8 +9,8 @@ import (
 	"time"
 
 	"github.com/bradfitz/gomemcache/memcache"
+	"github.com/cortexproject/cortex/pkg/util"
 	"github.com/go-kit/kit/log/level"
-	"github.com/weaveworks/cortex/pkg/util"
 )
 
 // MemcachedClient interface exists for mocking memcacheClient.

diff --git a/cache/memcached_test.go b/cache/memcached_test.go
@@ -7,8 +7,8 @@ import (
 	"testing"
 
 	"github.com/bradfitz/gomemcache/memcache"
+	"github.com/cortexproject/cortex/pkg/chunk/cache"
 	"github.com/stretchr/testify/require"
-	"github.com/weaveworks/cortex/pkg/chunk/cache"
 )
 
 func TestMemcached(t *testing.T) {

diff --git a/cache/snappy.go b/cache/snappy.go
@@ -3,9 +3,9 @@ package cache
 import (
 	"context"
 
+	"github.com/cortexproject/cortex/pkg/util"
 	"github.com/go-kit/kit/log/level"
 	"github.com/golang/snappy"
-	"github.com/weaveworks/cortex/pkg/util"
 )
 
 type snappyCache struct {

diff --git a/cache/tiered_test.go b/cache/tiered_test.go
@@ -4,8 +4,8 @@ import (
 	"context"
 	"testing"
 
+	"github.com/cortexproject/cortex/pkg/chunk/cache"
 	"github.com/stretchr/testify/require"
-	"github.com/weaveworks/cortex/pkg/chunk/cache"
 )
 
 func TestTieredSimple(t *testing.T) {

diff --git a/cassandra/fixtures.go b/cassandra/fixtures.go
@@ -5,10 +5,10 @@ import (
 	"flag"
 	"os"
 
+	"github.com/cortexproject/cortex/pkg/chunk"
+	"github.com/cortexproject/cortex/pkg/chunk/testutils"
+	"github.com/cortexproject/cortex/pkg/util"
 	"github.com/prometheus/common/model"
-	"github.com/weaveworks/cortex/pkg/chunk"
-	"github.com/weaveworks/cortex/pkg/chunk/testutils"
-	"github.com/weaveworks/cortex/pkg/util"
 )
 
 // GOCQL doesn't provide nice mocks, so we use a real Cassandra instance.

diff --git a/cassandra/storage_client.go b/cassandra/storage_client.go
@@ -11,8 +11,8 @@ import (
 	"github.com/pkg/errors"
 	"github.com/prometheus/common/model"
 
-	"github.com/weaveworks/cortex/pkg/chunk"
-	"github.com/weaveworks/cortex/pkg/chunk/util"
+	"github.com/cortexproject/cortex/pkg/chunk"
+	"github.com/cortexproject/cortex/pkg/chunk/util"
 )
 
 const (

diff --git a/cassandra/table_client.go b/cassandra/table_client.go
@@ -7,7 +7,7 @@ import (
 	"github.com/gocql/gocql"
 	"github.com/pkg/errors"
 
-	"github.com/weaveworks/cortex/pkg/chunk"
+	"github.com/cortexproject/cortex/pkg/chunk"
 )
 
 type tableClient struct {

diff --git a/chunk.go b/chunk.go
@@ -10,17 +10,17 @@ import (
 	"strings"
 	"sync"
 
+	prom_chunk "github.com/cortexproject/cortex/pkg/prom1/storage/local/chunk"
+	"github.com/cortexproject/cortex/pkg/prom1/storage/metric"
 	"github.com/golang/snappy"
 	jsoniter "github.com/json-iterator/go"
 	ot "github.com/opentracing/opentracing-go"
 	otlog "github.com/opentracing/opentracing-go/log"
 	"github.com/pkg/errors"
 	"github.com/prometheus/common/model"
-	prom_chunk "github.com/weaveworks/cortex/pkg/prom1/storage/local/chunk"
-	"github.com/weaveworks/cortex/pkg/prom1/storage/metric"
 
+	"github.com/cortexproject/cortex/pkg/util"
 	errs "github.com/weaveworks/common/errors"
-	"github.com/weaveworks/cortex/pkg/util"
 )
 
 // Errors that decode can return

diff --git a/chunk_store.go b/chunk_store.go
@@ -14,10 +14,10 @@ import (
 	"github.com/prometheus/prometheus/pkg/labels"
 	"github.com/prometheus/prometheus/promql"
 
+	"github.com/cortexproject/cortex/pkg/chunk/cache"
+	"github.com/cortexproject/cortex/pkg/util"
+	"github.com/cortexproject/cortex/pkg/util/extract"
 	"github.com/weaveworks/common/user"
-	"github.com/weaveworks/cortex/pkg/chunk/cache"
-	"github.com/weaveworks/cortex/pkg/util"
-	"github.com/weaveworks/cortex/pkg/util/extract"
 )
 
 var (

diff --git a/chunk_store_test.go b/chunk_store_test.go
@@ -15,11 +15,11 @@ import (
 	"github.com/stretchr/testify/require"
 	"golang.org/x/net/context"
 
+	"github.com/cortexproject/cortex/pkg/prom1/storage/local/chunk"
+	"github.com/cortexproject/cortex/pkg/util"
+	"github.com/cortexproject/cortex/pkg/util/extract"
 	"github.com/weaveworks/common/test"
 	"github.com/weaveworks/common/user"
-	"github.com/weaveworks/cortex/pkg/prom1/storage/local/chunk"
-	"github.com/weaveworks/cortex/pkg/util"
-	"github.com/weaveworks/cortex/pkg/util/extract"
 )
 
 type schemaFactory func(cfg SchemaConfig) Schema

diff --git a/chunk_store_utils.go b/chunk_store_utils.go
@@ -12,8 +12,8 @@ import (
 	"github.com/prometheus/prometheus/pkg/labels"
 	"github.com/prometheus/prometheus/promql"
 
-	"github.com/weaveworks/cortex/pkg/chunk/cache"
-	"github.com/weaveworks/cortex/pkg/util"
+	"github.com/cortexproject/cortex/pkg/chunk/cache"
+	"github.com/cortexproject/cortex/pkg/util"
 )
 
 const chunkDecodeParallelism = 16

diff --git a/chunk_test.go b/chunk_test.go
@@ -7,11 +7,11 @@ import (
 	"testing"
 	"time"
 
+	"github.com/cortexproject/cortex/pkg/prom1/storage/local/chunk"
+	"github.com/cortexproject/cortex/pkg/util"
 	"github.com/pkg/errors"
 	"github.com/prometheus/common/model"
 	"github.com/stretchr/testify/require"
-	"github.com/weaveworks/cortex/pkg/prom1/storage/local/chunk"
-	"github.com/weaveworks/cortex/pkg/util"
 )
 
 const userID = "userID"

diff --git a/gcp/fixtures.go b/gcp/fixtures.go
@@ -10,9 +10,9 @@ import (
 	"google.golang.org/api/option"
 	"google.golang.org/grpc"
 
-	"github.com/weaveworks/cortex/pkg/chunk"
-	"github.com/weaveworks/cortex/pkg/chunk/testutils"
-	"github.com/weaveworks/cortex/pkg/util"
+	"github.com/cortexproject/cortex/pkg/chunk"
+	"github.com/cortexproject/cortex/pkg/chunk/testutils"
+	"github.com/cortexproject/cortex/pkg/util"
 )
 
 const (

diff --git a/gcp/instrumentation.go b/gcp/instrumentation.go
@@ -9,7 +9,7 @@ import (
 	"google.golang.org/api/option"
 	"google.golang.org/grpc"
 
-	"github.com/weaveworks/cortex/pkg/util/middleware"
+	"github.com/cortexproject/cortex/pkg/util/middleware"
 )
 
 var bigtableRequestDuration = promauto.NewHistogramVec(prometheus.HistogramOpts{

diff --git a/gcp/storage_client.go b/gcp/storage_client.go
@@ -12,10 +12,10 @@ import (
 	otlog "github.com/opentracing/opentracing-go/log"
 	"github.com/prometheus/common/model"
 
+	"github.com/cortexproject/cortex/pkg/chunk"
+	chunk_util "github.com/cortexproject/cortex/pkg/chunk/util"
+	"github.com/cortexproject/cortex/pkg/util"
 	"github.com/pkg/errors"
-	"github.com/weaveworks/cortex/pkg/chunk"
-	chunk_util "github.com/weaveworks/cortex/pkg/chunk/util"
-	"github.com/weaveworks/cortex/pkg/util"
 )
 
 const (

diff --git a/gcp/table_client.go b/gcp/table_client.go
@@ -7,7 +7,7 @@ import (
 	"cloud.google.com/go/bigtable"
 	"google.golang.org/grpc/status"
 
-	"github.com/weaveworks/cortex/pkg/chunk"
+	"github.com/cortexproject/cortex/pkg/chunk"
 )
 
 type tableClient struct {

diff --git a/inmemory_storage_client.go b/inmemory_storage_client.go
@@ -7,9 +7,9 @@ import (
 	"sort"
 	"sync"
 
+	"github.com/cortexproject/cortex/pkg/util"
 	"github.com/go-kit/kit/log/level"
 	"github.com/prometheus/common/model"
-	"github.com/weaveworks/cortex/pkg/util"
 )
 
 // MockStorage is a fake in-memory StorageClient.

diff --git a/schema_config.go b/schema_config.go
@@ -8,8 +8,8 @@ import (
 
 	"github.com/prometheus/common/model"
 
+	"github.com/cortexproject/cortex/pkg/util"
 	"github.com/weaveworks/common/mtime"
-	"github.com/weaveworks/cortex/pkg/util"
 )
 
 const (

diff --git a/schema_test.go b/schema_test.go
@@ -9,10 +9,10 @@ import (
 	"testing"
 	"time"
 
+	"github.com/cortexproject/cortex/pkg/util"
 	"github.com/prometheus/common/model"
 	"github.com/stretchr/testify/require"
 	"github.com/weaveworks/common/test"
-	"github.com/weaveworks/cortex/pkg/util"
 )
 
 type ByHashRangeKey []IndexEntry

diff --git a/series_store.go b/series_store.go
@@ -11,10 +11,10 @@ import (
 	"github.com/prometheus/common/model"
 	"github.com/prometheus/prometheus/pkg/labels"
 
+	"github.com/cortexproject/cortex/pkg/chunk/cache"
+	"github.com/cortexproject/cortex/pkg/util"
+	"github.com/cortexproject/cortex/pkg/util/extract"
 	"github.com/weaveworks/common/user"
-	"github.com/weaveworks/cortex/pkg/chunk/cache"
-	"github.com/weaveworks/cortex/pkg/util"
-	"github.com/weaveworks/cortex/pkg/util/extract"
 )
 
 var (
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,7 +6,7 @@ import ( @@
     	"github.com/stretchr/testify/require"
-    	"github.com/weaveworks/cortex/pkg/chunk/testutils"
+    	"github.com/cortexproject/cortex/pkg/chunk/testutils"
     )
     const (
@@ Expand Down @@