From c71a9b0dceb52e0bf8555ccd41747e57c3465d26 Mon Sep 17 00:00:00 2001
From: Tom Wilkie <tom.wilkie@gmail.com>
Date: Thu, 18 Apr 2019 16:44:23 +0800
Subject: [PATCH] Fix logcli.
Signed-off-by: Tom Wilkie <tom.wilkie@gmail.com>
---
cmd/logcli/query.go | 4 ++--
pkg/promtail/promtail_test.go | 3 +--
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/cmd/logcli/query.go b/cmd/logcli/query.go
index 4a7b47f0..b28fadb6 100644
--- a/cmd/logcli/query.go
+++ b/cmd/logcli/query.go
@@ -8,10 +8,10 @@ import (
"github.com/fatih/color"
"github.com/prometheus/prometheus/pkg/labels"
+ "github.com/prometheus/prometheus/promql"
"github.com/grafana/loki/pkg/iter"
"github.com/grafana/loki/pkg/logproto"
- "github.com/grafana/loki/pkg/parser"
)
func doQuery() {
@@ -92,7 +92,7 @@ func padLabel(ls labels.Labels, maxLabelsLen int) string {
}
func mustParseLabels(labels string) labels.Labels {
- ls, err := parser.Labels(labels)
+ ls, err := promql.ParseMetric(labels)
if err != nil {
log.Fatalf("Failed to parse labels: %+v", err)
}
diff --git a/pkg/promtail/promtail_test.go b/pkg/promtail/promtail_test.go
index 5988d931..31f5b2aa 100644
--- a/pkg/promtail/promtail_test.go
+++ b/pkg/promtail/promtail_test.go
@@ -12,8 +12,6 @@ import (
"testing"
"time"
- "github.com/prometheus/prometheus/promql"
-
"github.com/cortexproject/cortex/pkg/util"
"github.com/cortexproject/cortex/pkg/util/flagext"
"github.com/go-kit/kit/log"
@@ -24,6 +22,7 @@ import (
"github.com/prometheus/prometheus/discovery/targetgroup"
"github.com/prometheus/prometheus/pkg/labels"
"github.com/prometheus/prometheus/pkg/textparse"
+ "github.com/prometheus/prometheus/promql"
"github.com/stretchr/testify/assert"
"github.com/grafana/loki/pkg/logproto"
--
GitLab