Skip to content
This repository has been archived by the owner on Aug 23, 2023. It is now read-only.

Commit

Permalink
rewrite imports for new pkg locations
Browse files Browse the repository at this point in the history
  • Loading branch information
@ywwg
ywwg committed Oct 11, 2022
1 parent 2b9d8e3 commit c7a5414
Show file tree
Hide file tree
Showing 1,357 changed files with 96,212 additions and 282,768 deletions.
42 changes: 21 additions & 21 deletions cmd/metrictank/metrictank.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,27 +18,27 @@ import (
"github.com/Dieterbe/profiletrigger/heap"
"github.com/Shopify/sarama"
"github.com/grafana/globalconf"
"github.com/grafana/metrictank/api"
"github.com/grafana/metrictank/cluster"
"github.com/grafana/metrictank/idx"
"github.com/grafana/metrictank/idx/bigtable"
"github.com/grafana/metrictank/idx/cassandra"
"github.com/grafana/metrictank/idx/memory"
metatagsBt "github.com/grafana/metrictank/idx/metatags/bigtable"
metatagsCass "github.com/grafana/metrictank/idx/metatags/cassandra"
"github.com/grafana/metrictank/input"
inCarbon "github.com/grafana/metrictank/input/carbon"
inKafkaMdm "github.com/grafana/metrictank/input/kafkamdm"
"github.com/grafana/metrictank/jaeger"
"github.com/grafana/metrictank/logger"
"github.com/grafana/metrictank/mdata"
"github.com/grafana/metrictank/mdata/cache"
"github.com/grafana/metrictank/mdata/notifierKafka"
"github.com/grafana/metrictank/stats"
statsConfig "github.com/grafana/metrictank/stats/config"
bigtableStore "github.com/grafana/metrictank/store/bigtable"
cassandraStore "github.com/grafana/metrictank/store/cassandra"
"github.com/grafana/metrictank/util"
"github.com/grafana/metrictank/pkg/api"
"github.com/grafana/metrictank/pkg/cluster"
"github.com/grafana/metrictank/pkg/idx"
"github.com/grafana/metrictank/pkg/idx/bigtable"
"github.com/grafana/metrictank/pkg/idx/cassandra"
"github.com/grafana/metrictank/pkg/idx/memory"
metatagsBt "github.com/grafana/metrictank/pkg/idx/metatags/bigtable"
metatagsCass "github.com/grafana/metrictank/pkg/idx/metatags/cassandra"
"github.com/grafana/metrictank/pkg/input"
inCarbon "github.com/grafana/metrictank/pkg/input/carbon"
inKafkaMdm "github.com/grafana/metrictank/pkg/input/kafkamdm"
"github.com/grafana/metrictank/pkg/jaeger"
"github.com/grafana/metrictank/pkg/logger"
"github.com/grafana/metrictank/pkg/mdata"
"github.com/grafana/metrictank/pkg/mdata/cache"
"github.com/grafana/metrictank/pkg/mdata/notifierKafka"
"github.com/grafana/metrictank/pkg/stats"
statsConfig "github.com/grafana/metrictank/pkg/stats/config"
bigtableStore "github.com/grafana/metrictank/pkg/store/bigtable"
cassandraStore "github.com/grafana/metrictank/pkg/store/cassandra"
"github.com/grafana/metrictank/pkg/util"
"github.com/raintank/dur"
log "github.com/sirupsen/logrus"
)
Expand Down
6 changes: 3 additions & 3 deletions cmd/mt-aggs-explain/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import (
"os"
"runtime"

"github.com/grafana/metrictank/conf"
"github.com/grafana/metrictank/consolidation"
"github.com/grafana/metrictank/logger"
"github.com/grafana/metrictank/pkg/conf"
"github.com/grafana/metrictank/pkg/consolidation"
"github.com/grafana/metrictank/pkg/logger"
log "github.com/sirupsen/logrus"
)

Expand Down
22 changes: 11 additions & 11 deletions cmd/mt-backfill/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,17 @@ import (

"github.com/Shopify/sarama"
"github.com/grafana/globalconf"
"github.com/grafana/metrictank/api"
"github.com/grafana/metrictank/cluster"
"github.com/grafana/metrictank/idx"
"github.com/grafana/metrictank/idx/memory"
"github.com/grafana/metrictank/input"
inKafka "github.com/grafana/metrictank/input/kafkamdm"
"github.com/grafana/metrictank/logger"
"github.com/grafana/metrictank/mdata"
"github.com/grafana/metrictank/schema"
"github.com/grafana/metrictank/schema/msg"
cassandraStore "github.com/grafana/metrictank/store/cassandra"
"github.com/grafana/metrictank/pkg/api"
"github.com/grafana/metrictank/pkg/cluster"
"github.com/grafana/metrictank/pkg/idx"
"github.com/grafana/metrictank/pkg/idx/memory"
"github.com/grafana/metrictank/pkg/input"
inKafka "github.com/grafana/metrictank/pkg/input/kafkamdm"
"github.com/grafana/metrictank/pkg/logger"
"github.com/grafana/metrictank/pkg/mdata"
"github.com/grafana/metrictank/pkg/schema"
"github.com/grafana/metrictank/pkg/schema/msg"
cassandraStore "github.com/grafana/metrictank/pkg/store/cassandra"
"github.com/raintank/dur"
log "github.com/sirupsen/logrus"
)
Expand Down
2 changes: 1 addition & 1 deletion cmd/mt-control-server/cassandra.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (

"github.com/gocql/gocql"
"github.com/grafana/globalconf"
"github.com/grafana/metrictank/cassandra"
"github.com/grafana/metrictank/pkg/cassandra"
)

// CliConfig is a cassandra IdxConfig. It is instantiated with default values which can then be changed.
Expand Down
14 changes: 7 additions & 7 deletions cmd/mt-control-server/handlers.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@ import (
"github.com/Shopify/sarama"
"github.com/gocql/gocql"
"github.com/grafana/globalconf"
"github.com/grafana/metrictank/api/models"
"github.com/grafana/metrictank/api/response"
"github.com/grafana/metrictank/cmd/mt-control-server/controlmodels"
"github.com/grafana/metrictank/expr/tagquery"
"github.com/grafana/metrictank/idx"
"github.com/grafana/metrictank/schema"
"github.com/grafana/metrictank/schema/msg"
"github.com/grafana/metrictank/util"
"github.com/grafana/metrictank/pkg/api/models"
"github.com/grafana/metrictank/pkg/api/response"
"github.com/grafana/metrictank/pkg/expr/tagquery"
"github.com/grafana/metrictank/pkg/idx"
"github.com/grafana/metrictank/pkg/schema"
"github.com/grafana/metrictank/pkg/schema/msg"
"github.com/grafana/metrictank/pkg/util"
log "github.com/sirupsen/logrus"
"gopkg.in/macaron.v1"
)
Expand Down
2 changes: 1 addition & 1 deletion cmd/mt-control-server/producer.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (

"github.com/Shopify/sarama"
"github.com/grafana/globalconf"
"github.com/grafana/metrictank/kafka"
"github.com/grafana/metrictank/pkg/kafka"
log "github.com/sirupsen/logrus"
)

Expand Down
4 changes: 2 additions & 2 deletions cmd/mt-explain/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"os"
"time"

"github.com/grafana/metrictank/expr"
"github.com/grafana/metrictank/logger"
"github.com/grafana/metrictank/pkg/expr"
"github.com/grafana/metrictank/pkg/logger"
"github.com/raintank/dur"
log "github.com/sirupsen/logrus"
)
Expand Down
2 changes: 1 addition & 1 deletion cmd/mt-fakemetrics/cmd/agents.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (

"time"

"github.com/grafana/metrictank/schema"
"github.com/grafana/metrictank/pkg/schema"
"github.com/raintank/worldping-api/pkg/log"
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/mt-fakemetrics/cmd/bad.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
"time"

"github.com/grafana/metrictank/cmd/mt-fakemetrics/out"
"github.com/grafana/metrictank/schema"
"github.com/grafana/metrictank/pkg/schema"
"github.com/raintank/worldping-api/pkg/log"
"github.com/spf13/cobra"
)
Expand Down
4 changes: 2 additions & 2 deletions cmd/mt-fakemetrics/cmd/containers.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ import (

"time"

"github.com/grafana/metrictank/clock"
"github.com/grafana/metrictank/cmd/mt-fakemetrics/out"
"github.com/grafana/metrictank/cmd/mt-fakemetrics/policy"
"github.com/grafana/metrictank/schema"
"github.com/grafana/metrictank/pkg/clock"
"github.com/grafana/metrictank/pkg/schema"
log "github.com/sirupsen/logrus"
)

Expand Down
4 changes: 2 additions & 2 deletions cmd/mt-fakemetrics/cmd/datafeed.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ import (
"math"
"time"

"github.com/grafana/metrictank/clock"
"github.com/grafana/metrictank/cmd/mt-fakemetrics/metricbuilder"
"github.com/grafana/metrictank/cmd/mt-fakemetrics/out"
"github.com/grafana/metrictank/cmd/mt-fakemetrics/policy"
"github.com/grafana/metrictank/schema"
"github.com/grafana/metrictank/pkg/clock"
"github.com/grafana/metrictank/pkg/schema"
"github.com/raintank/worldping-api/pkg/log"
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/mt-fakemetrics/cmd/resolutionchange.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
"time"

"github.com/grafana/metrictank/cmd/mt-fakemetrics/out"
"github.com/grafana/metrictank/schema"
"github.com/grafana/metrictank/pkg/schema"
log "github.com/sirupsen/logrus"
"github.com/spf13/cobra"
)
Expand Down
2 changes: 1 addition & 1 deletion cmd/mt-fakemetrics/cmd/schemasbackfill.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"time"

"github.com/grafana/metrictank/cmd/mt-fakemetrics/policy"
"github.com/grafana/metrictank/conf"
"github.com/grafana/metrictank/pkg/conf"
log "github.com/sirupsen/logrus"
"github.com/spf13/cobra"
)
Expand Down
2 changes: 1 addition & 1 deletion cmd/mt-fakemetrics/cmd/storageconf.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
"time"

"github.com/grafana/metrictank/cmd/mt-fakemetrics/out"
"github.com/grafana/metrictank/schema"
"github.com/grafana/metrictank/pkg/schema"
log "github.com/sirupsen/logrus"
"github.com/spf13/cobra"
)
Expand Down
3 changes: 1 addition & 2 deletions cmd/mt-fakemetrics/metricbuilder/builder.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,14 @@
// | >1 | Yes | use directive to print the number |
// | 1 | No | don't use directive |
// | >1 | No | invalid: will panic |
//
package metricbuilder

import (
"fmt"
"strconv"
"strings"

"github.com/grafana/metrictank/schema"
"github.com/grafana/metrictank/pkg/schema"
)

type Builder interface {
Expand Down
2 changes: 1 addition & 1 deletion cmd/mt-fakemetrics/out/carbon/carbon.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"time"

"github.com/grafana/metrictank/cmd/mt-fakemetrics/out"
"github.com/grafana/metrictank/schema"
"github.com/grafana/metrictank/pkg/schema"
"github.com/raintank/met"
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/mt-fakemetrics/out/fanout.go
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package out

import "github.com/grafana/metrictank/schema"
import "github.com/grafana/metrictank/pkg/schema"

type multiErr struct {
errors []error
Expand Down
4 changes: 2 additions & 2 deletions cmd/mt-fakemetrics/out/gnet/gnet.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (
"time"

"github.com/grafana/metrictank/cmd/mt-fakemetrics/out"
"github.com/grafana/metrictank/schema"
"github.com/grafana/metrictank/schema/msg"
"github.com/grafana/metrictank/pkg/schema"
"github.com/grafana/metrictank/pkg/schema/msg"
"github.com/jpillora/backoff"
"github.com/raintank/met"
"github.com/raintank/worldping-api/pkg/log"
Expand Down
6 changes: 3 additions & 3 deletions cmd/mt-fakemetrics/out/kafkamdm/kafkamdm.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ import (
"time"

"github.com/Shopify/sarama"
p "github.com/grafana/metrictank/cluster/partitioner"
"github.com/grafana/metrictank/cmd/mt-fakemetrics/out"
"github.com/grafana/metrictank/cmd/mt-fakemetrics/out/kafkamdm/keycache"
"github.com/grafana/metrictank/schema"
"github.com/grafana/metrictank/schema/msg"
p "github.com/grafana/metrictank/pkg/cluster/partitioner"
"github.com/grafana/metrictank/pkg/schema"
"github.com/grafana/metrictank/pkg/schema/msg"
"github.com/raintank/met"
log "github.com/sirupsen/logrus"
)
Expand Down
2 changes: 1 addition & 1 deletion cmd/mt-fakemetrics/out/kafkamdm/keycache/cache.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package keycache
import (
"time"

"github.com/grafana/metrictank/schema"
"github.com/grafana/metrictank/pkg/schema"
)

// Cache is a single-tenant keycache
Expand Down
2 changes: 1 addition & 1 deletion cmd/mt-fakemetrics/out/kafkamdm/keycache/keycache.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"sync"
"time"

"github.com/grafana/metrictank/schema"
"github.com/grafana/metrictank/pkg/schema"
)

// KeyCache tracks for all orgs, which keys have been seen, and when was the last time
Expand Down
2 changes: 1 addition & 1 deletion cmd/mt-fakemetrics/out/kafkamdm/keycache/shard.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"sync"
"time"

"github.com/grafana/metrictank/schema"
"github.com/grafana/metrictank/pkg/schema"
)

// SubKey is the last 15 bytes of a 16 byte Key
Expand Down
2 changes: 1 addition & 1 deletion cmd/mt-fakemetrics/out/kafkamdm/keycache/shard_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"testing"
"time"

"github.com/grafana/metrictank/schema"
"github.com/grafana/metrictank/pkg/schema"
)

func GetKey(suffix int) schema.Key {
Expand Down
2 changes: 1 addition & 1 deletion cmd/mt-fakemetrics/out/offsetfilter.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package out
import (
"errors"

"github.com/grafana/metrictank/schema"
"github.com/grafana/metrictank/pkg/schema"
"github.com/raintank/dur"
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/mt-fakemetrics/out/out.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package out
import (
"fmt"

"github.com/grafana/metrictank/schema"
"github.com/grafana/metrictank/pkg/schema"
"github.com/raintank/met"
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/mt-fakemetrics/out/periodfilter.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"strconv"
"strings"

"github.com/grafana/metrictank/schema"
"github.com/grafana/metrictank/pkg/schema"
)

type rule struct {
Expand Down
2 changes: 1 addition & 1 deletion cmd/mt-fakemetrics/out/stdout/stdout.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"time"

"github.com/grafana/metrictank/cmd/mt-fakemetrics/out"
"github.com/grafana/metrictank/schema"
"github.com/grafana/metrictank/pkg/schema"
"github.com/raintank/met"
)

Expand Down
Loading

0 comments on commit c7a5414

Please sign in to comment.