fix: Fix the lokitool imports (#12673)

Signed-off-by: Michel Hollands <michel.hollands@gmail.com>
pull/12672/head
Michel Hollands 2 years ago committed by GitHub
parent 7b7d3d4cd2
commit 6dce98870d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 2
      cmd/lokitool/main.go
  2. 2
      pkg/tool/client/rules.go
  3. 8
      pkg/tool/commands/rules.go
  4. 2
      pkg/tool/commands/rules_test.go
  5. 4
      pkg/tool/printer/printer.go
  6. 2
      pkg/tool/printer/printer_test.go
  7. 2
      pkg/tool/rules/compare.go
  8. 2
      pkg/tool/rules/compare_test.go
  9. 2
      pkg/tool/rules/parser.go
  10. 2
      pkg/tool/rules/parser_test.go
  11. 4
      pkg/tool/rules/rules.go
  12. 2
      pkg/tool/rules/rules_test.go

@ -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 (

@ -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

@ -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 (

@ -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) {

@ -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

@ -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) {

@ -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 (

@ -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) {

@ -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 (

@ -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) {

@ -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

@ -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) {

Loading…
Cancel
Save