Skip to content

Commit

Permalink
fix: Fix the lokitool imports (#12673)
Browse files Browse the repository at this point in the history
Signed-off-by: Michel Hollands <[email protected]>
  • Loading branch information
MichelHollands authored Apr 18, 2024
1 parent 7b7d3d4 commit 6dce988
Show file tree
Hide file tree
Showing 12 changed files with 17 additions and 17 deletions.
2 changes: 1 addition & 1 deletion cmd/lokitool/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (

"github.com/prometheus/common/version"

"github.com/grafana/loki/pkg/tool/commands"
"github.com/grafana/loki/v3/pkg/tool/commands"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion pkg/tool/client/rules.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
log "github.com/sirupsen/logrus"
"gopkg.in/yaml.v3"

"github.com/grafana/loki/pkg/tool/rules/rwrulefmt"
"github.com/grafana/loki/v3/pkg/tool/rules/rwrulefmt"
)

// CreateRuleGroup creates a new rule group
Expand Down
8 changes: 4 additions & 4 deletions pkg/tool/commands/rules.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ import (
"gopkg.in/alecthomas/kingpin.v2"
yamlv3 "gopkg.in/yaml.v3"

"github.com/grafana/loki/pkg/tool/client"
"github.com/grafana/loki/pkg/tool/printer"
"github.com/grafana/loki/pkg/tool/rules"
"github.com/grafana/loki/pkg/tool/rules/rwrulefmt"
"github.com/grafana/loki/v3/pkg/tool/client"
"github.com/grafana/loki/v3/pkg/tool/printer"
"github.com/grafana/loki/v3/pkg/tool/rules"
"github.com/grafana/loki/v3/pkg/tool/rules/rwrulefmt"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion pkg/tool/commands/rules_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"github.com/stretchr/testify/assert"
"gopkg.in/yaml.v3"

"github.com/grafana/loki/pkg/tool/rules/rwrulefmt"
"github.com/grafana/loki/v3/pkg/tool/rules/rwrulefmt"
)

func TestCheckDuplicates(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions pkg/tool/printer/printer.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ import (
"github.com/mitchellh/colorstring"
"gopkg.in/yaml.v3"

"github.com/grafana/loki/pkg/tool/rules"
"github.com/grafana/loki/pkg/tool/rules/rwrulefmt"
"github.com/grafana/loki/v3/pkg/tool/rules"
"github.com/grafana/loki/v3/pkg/tool/rules/rwrulefmt"
)

// Printer is used for printing formatted output from the cortextool
Expand Down
2 changes: 1 addition & 1 deletion pkg/tool/printer/printer_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"

"github.com/grafana/loki/pkg/tool/rules/rwrulefmt"
"github.com/grafana/loki/v3/pkg/tool/rules/rwrulefmt"
)

func TestPrintRuleSet(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion pkg/tool/rules/compare.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"github.com/prometheus/prometheus/model/rulefmt"
yaml "gopkg.in/yaml.v3"

"github.com/grafana/loki/pkg/tool/rules/rwrulefmt"
"github.com/grafana/loki/v3/pkg/tool/rules/rwrulefmt"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion pkg/tool/rules/compare_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"github.com/prometheus/prometheus/model/rulefmt"
yaml "gopkg.in/yaml.v3"

"github.com/grafana/loki/pkg/tool/rules/rwrulefmt"
"github.com/grafana/loki/v3/pkg/tool/rules/rwrulefmt"
)

func Test_rulesEqual(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion pkg/tool/rules/parser.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
log "github.com/sirupsen/logrus"
yaml "gopkg.in/yaml.v3"

"github.com/grafana/loki/pkg/ruler"
"github.com/grafana/loki/v3/pkg/ruler"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion pkg/tool/rules/parser_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (

"github.com/prometheus/prometheus/model/rulefmt"

"github.com/grafana/loki/pkg/tool/rules/rwrulefmt"
"github.com/grafana/loki/v3/pkg/tool/rules/rwrulefmt"
)

func TestParseFiles(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions pkg/tool/rules/rules.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import (
"github.com/prometheus/prometheus/promql/parser"
log "github.com/sirupsen/logrus"

logql "github.com/grafana/loki/pkg/logql/syntax"
logql "github.com/grafana/loki/v3/pkg/logql/syntax"

"github.com/grafana/loki/pkg/tool/rules/rwrulefmt"
"github.com/grafana/loki/v3/pkg/tool/rules/rwrulefmt"
)

// RuleNamespace is used to parse a slightly modified prometheus
Expand Down
2 changes: 1 addition & 1 deletion pkg/tool/rules/rules_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"gopkg.in/yaml.v3"
"gotest.tools/assert"

"github.com/grafana/loki/pkg/tool/rules/rwrulefmt"
"github.com/grafana/loki/v3/pkg/tool/rules/rwrulefmt"
)

func TestAggregateBy(t *testing.T) {
Expand Down

0 comments on commit 6dce988

Please sign in to comment.