mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2024-12-24 05:04:05 -08:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Merge pull request #9478 from prometheus/beorn7/pkg-deprecation

Browse source 
Move packages out of deprecated pkg directory
This commit is contained in:
Björn Rabenstein 2021-11-09 11:09:16 +01:00 committed by GitHub
parent a0d31c28fc c954cd9d1d
commit 4c56a193c5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
168 changed files with 207 additions and 208 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
cmd/prometheus/main.go
View file

@ -60,12 +60,10 @@ import (
_ "github.com/prometheus/prometheus/discovery/install" // Register service discovery implementations. _ "github.com/prometheus/prometheus/discovery/install" // Register service discovery implementations.
"github.com/prometheus/prometheus/discovery/legacymanager" "github.com/prometheus/prometheus/discovery/legacymanager"
"github.com/prometheus/prometheus/discovery/targetgroup" "github.com/prometheus/prometheus/discovery/targetgroup"
"github.com/prometheus/prometheus/model/exemplar"
"github.com/prometheus/prometheus/model/labels"
"github.com/prometheus/prometheus/model/relabel"
"github.com/prometheus/prometheus/notifier" "github.com/prometheus/prometheus/notifier"
"github.com/prometheus/prometheus/pkg/exemplar"
"github.com/prometheus/prometheus/pkg/labels"
"github.com/prometheus/prometheus/pkg/logging"
"github.com/prometheus/prometheus/pkg/relabel"
prom_runtime "github.com/prometheus/prometheus/pkg/runtime"
"github.com/prometheus/prometheus/promql" "github.com/prometheus/prometheus/promql"
"github.com/prometheus/prometheus/rules" "github.com/prometheus/prometheus/rules"
"github.com/prometheus/prometheus/scrape" "github.com/prometheus/prometheus/scrape"
@ -73,6 +71,8 @@ import (
"github.com/prometheus/prometheus/storage/remote" "github.com/prometheus/prometheus/storage/remote"
"github.com/prometheus/prometheus/tsdb" "github.com/prometheus/prometheus/tsdb"
"github.com/prometheus/prometheus/tsdb/agent" "github.com/prometheus/prometheus/tsdb/agent"
"github.com/prometheus/prometheus/util/logging"
prom_runtime "github.com/prometheus/prometheus/util/runtime"
"github.com/prometheus/prometheus/util/strutil" "github.com/prometheus/prometheus/util/strutil"
"github.com/prometheus/prometheus/web" "github.com/prometheus/prometheus/web"
) )

2
cmd/prometheus/main_test.go
View file

@ -32,8 +32,8 @@ import (
"github.com/prometheus/common/model" "github.com/prometheus/common/model"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"github.com/prometheus/prometheus/model/labels"
"github.com/prometheus/prometheus/notifier" "github.com/prometheus/prometheus/notifier"
"github.com/prometheus/prometheus/pkg/labels"
"github.com/prometheus/prometheus/rules" "github.com/prometheus/prometheus/rules"
) )

4
cmd/promtool/backfill.go
View file

@ -22,8 +22,8 @@ import (
"github.com/go-kit/log" "github.com/go-kit/log"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/prometheus/prometheus/pkg/labels" "github.com/prometheus/prometheus/model/labels"
"github.com/prometheus/prometheus/pkg/textparse" "github.com/prometheus/prometheus/model/textparse"
"github.com/prometheus/prometheus/tsdb" "github.com/prometheus/prometheus/tsdb"
tsdb_errors "github.com/prometheus/prometheus/tsdb/errors" tsdb_errors "github.com/prometheus/prometheus/tsdb/errors"
) )

2
cmd/promtool/backfill_test.go
View file

@ -24,7 +24,7 @@ import (
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"github.com/prometheus/prometheus/pkg/labels" "github.com/prometheus/prometheus/model/labels"
"github.com/prometheus/prometheus/storage" "github.com/prometheus/prometheus/storage"
"github.com/prometheus/prometheus/tsdb" "github.com/prometheus/prometheus/tsdb"
) )

4
cmd/promtool/main.go
View file

@ -49,9 +49,9 @@ import (
_ "github.com/prometheus/prometheus/discovery/install" // Register service discovery implementations. _ "github.com/prometheus/prometheus/discovery/install" // Register service discovery implementations.
"github.com/prometheus/prometheus/discovery/kubernetes" "github.com/prometheus/prometheus/discovery/kubernetes"
"github.com/prometheus/prometheus/discovery/targetgroup" "github.com/prometheus/prometheus/discovery/targetgroup"
"github.com/prometheus/prometheus/model/labels"
"github.com/prometheus/prometheus/model/rulefmt"
"github.com/prometheus/prometheus/notifier" "github.com/prometheus/prometheus/notifier"
"github.com/prometheus/prometheus/pkg/labels"
"github.com/prometheus/prometheus/pkg/rulefmt"
"github.com/prometheus/prometheus/promql" "github.com/prometheus/prometheus/promql"
"github.com/prometheus/prometheus/scrape" "github.com/prometheus/prometheus/scrape"
) )

4
cmd/promtool/main_test.go
View file

@ -23,8 +23,8 @@ import (
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"github.com/prometheus/prometheus/pkg/labels" "github.com/prometheus/prometheus/model/labels"
"github.com/prometheus/prometheus/pkg/rulefmt" "github.com/prometheus/prometheus/model/rulefmt"
) )
func TestQueryRange(t *testing.T) { func TestQueryRange(t *testing.T) {

4
cmd/promtool/rules.go
View file

@ -24,8 +24,8 @@ import (
v1 "github.com/prometheus/client_golang/api/prometheus/v1" v1 "github.com/prometheus/client_golang/api/prometheus/v1"
"github.com/prometheus/common/model" "github.com/prometheus/common/model"
"github.com/prometheus/prometheus/pkg/labels" "github.com/prometheus/prometheus/model/labels"
"github.com/prometheus/prometheus/pkg/timestamp" "github.com/prometheus/prometheus/model/timestamp"
"github.com/prometheus/prometheus/rules" "github.com/prometheus/prometheus/rules"
"github.com/prometheus/prometheus/storage" "github.com/prometheus/prometheus/storage"
"github.com/prometheus/prometheus/tsdb" "github.com/prometheus/prometheus/tsdb"

2
cmd/promtool/rules_test.go
View file

@ -27,7 +27,7 @@ import (
"github.com/prometheus/common/model" "github.com/prometheus/common/model"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"github.com/prometheus/prometheus/pkg/labels" "github.com/prometheus/prometheus/model/labels"
"github.com/prometheus/prometheus/tsdb" "github.com/prometheus/prometheus/tsdb"
) )

2
cmd/promtool/sd.go
View file

@ -26,7 +26,7 @@ import (
"github.com/prometheus/prometheus/config" "github.com/prometheus/prometheus/config"
"github.com/prometheus/prometheus/discovery" "github.com/prometheus/prometheus/discovery"
"github.com/prometheus/prometheus/discovery/targetgroup" "github.com/prometheus/prometheus/discovery/targetgroup"
"github.com/prometheus/prometheus/pkg/labels" "github.com/prometheus/prometheus/model/labels"
"github.com/prometheus/prometheus/scrape" "github.com/prometheus/prometheus/scrape"
) )

4
cmd/promtool/sd_test.go
View file

@ -20,8 +20,8 @@ import (
"github.com/prometheus/prometheus/config" "github.com/prometheus/prometheus/config"
"github.com/prometheus/prometheus/discovery/targetgroup" "github.com/prometheus/prometheus/discovery/targetgroup"
"github.com/prometheus/prometheus/pkg/labels" "github.com/prometheus/prometheus/model/labels"
"github.com/prometheus/prometheus/pkg/relabel" "github.com/prometheus/prometheus/model/relabel"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
) )

2
cmd/promtool/tsdb.go
View file

@ -38,7 +38,7 @@ import (
"github.com/go-kit/log" "github.com/go-kit/log"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/prometheus/prometheus/pkg/labels" "github.com/prometheus/prometheus/model/labels"
"github.com/prometheus/prometheus/tsdb" "github.com/prometheus/prometheus/tsdb"
"github.com/prometheus/prometheus/tsdb/chunks" "github.com/prometheus/prometheus/tsdb/chunks"
tsdb_errors "github.com/prometheus/prometheus/tsdb/errors" tsdb_errors "github.com/prometheus/prometheus/tsdb/errors"

2
cmd/promtool/unittest.go
View file

@ -30,7 +30,7 @@ import (
"github.com/prometheus/common/model" "github.com/prometheus/common/model"
yaml "gopkg.in/yaml.v2" yaml "gopkg.in/yaml.v2"
"github.com/prometheus/prometheus/pkg/labels" "github.com/prometheus/prometheus/model/labels"
"github.com/prometheus/prometheus/promql" "github.com/prometheus/prometheus/promql"
"github.com/prometheus/prometheus/promql/parser" "github.com/prometheus/prometheus/promql/parser"
"github.com/prometheus/prometheus/rules" "github.com/prometheus/prometheus/rules"

4
config/config.go
View file

@ -33,8 +33,8 @@ import (
yaml "gopkg.in/yaml.v2" yaml "gopkg.in/yaml.v2"
"github.com/prometheus/prometheus/discovery" "github.com/prometheus/prometheus/discovery"
"github.com/prometheus/prometheus/pkg/labels" "github.com/prometheus/prometheus/model/labels"
"github.com/prometheus/prometheus/pkg/relabel" "github.com/prometheus/prometheus/model/relabel"
) )
var ( var (

4
config/config_test.go
View file

@ -52,8 +52,8 @@ import (
"github.com/prometheus/prometheus/discovery/uyuni" "github.com/prometheus/prometheus/discovery/uyuni"
"github.com/prometheus/prometheus/discovery/xds" "github.com/prometheus/prometheus/discovery/xds"
"github.com/prometheus/prometheus/discovery/zookeeper" "github.com/prometheus/prometheus/discovery/zookeeper"
"github.com/prometheus/prometheus/pkg/labels" "github.com/prometheus/prometheus/model/labels"
"github.com/prometheus/prometheus/pkg/relabel" "github.com/prometheus/prometheus/model/relabel"
) )
func mustParseURL(u string) *config.URL { func mustParseURL(u string) *config.URL {

2
pkg/exemplar/exemplar.go → model/exemplar/exemplar.go
View file

@ -13,7 +13,7 @@
package exemplar package exemplar
import "github.com/prometheus/prometheus/pkg/labels" import "github.com/prometheus/prometheus/model/labels"
// The combined length of the label names and values of an Exemplar's LabelSet MUST NOT exceed 128 UTF-8 characters // The combined length of the label names and values of an Exemplar's LabelSet MUST NOT exceed 128 UTF-8 characters
// https://github.com/OpenObservability/OpenMetrics/blob/main/specification/OpenMetrics.md#exemplars // https://github.com/OpenObservability/OpenMetrics/blob/main/specification/OpenMetrics.md#exemplars

0
pkg/labels/labels.go → model/labels/labels.go
View file

0
pkg/labels/labels_test.go → model/labels/labels_test.go
View file

0
pkg/labels/matcher.go → model/labels/matcher.go
View file

0
pkg/labels/matcher_test.go → model/labels/matcher_test.go
View file

0
pkg/labels/regexp.go → model/labels/regexp.go
View file

0
pkg/labels/regexp_test.go → model/labels/regexp_test.go
View file

0
pkg/labels/test_utils.go → model/labels/test_utils.go
View file

2
pkg/relabel/relabel.go → model/relabel/relabel.go
View file

@ -22,7 +22,7 @@ import (
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/prometheus/common/model" "github.com/prometheus/common/model"
"github.com/prometheus/prometheus/pkg/labels" "github.com/prometheus/prometheus/model/labels"
) )
var ( var (

2
pkg/relabel/relabel_test.go → model/relabel/relabel_test.go
View file

@ -19,7 +19,7 @@ import (
"github.com/prometheus/common/model" "github.com/prometheus/common/model"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"github.com/prometheus/prometheus/pkg/labels" "github.com/prometheus/prometheus/model/labels"
) )
func TestRelabel(t *testing.T) { func TestRelabel(t *testing.T) {

2
pkg/rulefmt/rulefmt.go → model/rulefmt/rulefmt.go
View file

@ -25,7 +25,7 @@ import (
"github.com/prometheus/common/model" "github.com/prometheus/common/model"
yaml "gopkg.in/yaml.v3" yaml "gopkg.in/yaml.v3"
"github.com/prometheus/prometheus/pkg/timestamp" "github.com/prometheus/prometheus/model/timestamp"
"github.com/prometheus/prometheus/promql/parser" "github.com/prometheus/prometheus/promql/parser"
"github.com/prometheus/prometheus/template" "github.com/prometheus/prometheus/template"
) )

0
pkg/rulefmt/rulefmt_test.go → model/rulefmt/rulefmt_test.go
View file

0
pkg/rulefmt/testdata/bad_annotation.bad.yaml → model/rulefmt/testdata/bad_annotation.bad.yaml vendored
View file

0
pkg/rulefmt/testdata/bad_expr.bad.yaml → model/rulefmt/testdata/bad_expr.bad.yaml vendored
View file

0
pkg/rulefmt/testdata/bad_field.bad.yaml → model/rulefmt/testdata/bad_field.bad.yaml vendored
View file

0
pkg/rulefmt/testdata/bad_lname.bad.yaml → model/rulefmt/testdata/bad_lname.bad.yaml vendored
View file

0
pkg/rulefmt/testdata/duplicate_grp.bad.yaml → model/rulefmt/testdata/duplicate_grp.bad.yaml vendored
View file

0
pkg/rulefmt/testdata/invalid_label_name.bad.yaml → model/rulefmt/testdata/invalid_label_name.bad.yaml vendored
View file

0
pkg/rulefmt/testdata/invalid_record_name.bad.yaml → model/rulefmt/testdata/invalid_record_name.bad.yaml vendored
View file

0
pkg/rulefmt/testdata/no_rec_alert.bad.yaml → model/rulefmt/testdata/no_rec_alert.bad.yaml vendored
View file

0
pkg/rulefmt/testdata/noexpr.bad.yaml → model/rulefmt/testdata/noexpr.bad.yaml vendored
View file

0
pkg/rulefmt/testdata/record_and_alert.bad.yaml → model/rulefmt/testdata/record_and_alert.bad.yaml vendored
View file

0
pkg/rulefmt/testdata/test.yaml → model/rulefmt/testdata/test.yaml vendored
View file

0
pkg/textparse/README.md → model/textparse/README.md
View file

4
pkg/textparse/interface.go → model/textparse/interface.go
View file

@ -16,8 +16,8 @@ package textparse
import ( import (
"mime" "mime"
"github.com/prometheus/prometheus/pkg/exemplar" "github.com/prometheus/prometheus/model/exemplar"
"github.com/prometheus/prometheus/pkg/labels" "github.com/prometheus/prometheus/model/labels"
) )
// Parser parses samples from a byte slice of samples in the official // Parser parses samples from a byte slice of samples in the official

0
pkg/textparse/openmetricslex.l → model/textparse/openmetricslex.l
View file

0
pkg/textparse/openmetricslex.l.go → model/textparse/openmetricslex.l.go
View file

6
pkg/textparse/openmetricsparse.go → model/textparse/openmetricsparse.go
View file

@ -27,9 +27,9 @@ import (
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/prometheus/prometheus/pkg/exemplar" "github.com/prometheus/prometheus/model/exemplar"
"github.com/prometheus/prometheus/pkg/labels" "github.com/prometheus/prometheus/model/labels"
"github.com/prometheus/prometheus/pkg/value" "github.com/prometheus/prometheus/model/value"
) )
var allowedSuffixes = [][]byte{[]byte("_total"), []byte("_bucket")} var allowedSuffixes = [][]byte{[]byte("_total"), []byte("_bucket")}

4
pkg/textparse/openmetricsparse_test.go → model/textparse/openmetricsparse_test.go
View file

@ -19,8 +19,8 @@ import (
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"github.com/prometheus/prometheus/pkg/exemplar" "github.com/prometheus/prometheus/model/exemplar"
"github.com/prometheus/prometheus/pkg/labels" "github.com/prometheus/prometheus/model/labels"
) )
func TestOpenMetricsParse(t *testing.T) { func TestOpenMetricsParse(t *testing.T) {

0
pkg/textparse/promlex.l → model/textparse/promlex.l
View file

0
pkg/textparse/promlex.l.go → model/textparse/promlex.l.go
View file

6
pkg/textparse/promparse.go → model/textparse/promparse.go
View file

@ -28,9 +28,9 @@ import (
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/prometheus/prometheus/pkg/exemplar" "github.com/prometheus/prometheus/model/exemplar"
"github.com/prometheus/prometheus/pkg/labels" "github.com/prometheus/prometheus/model/labels"
"github.com/prometheus/prometheus/pkg/value" "github.com/prometheus/prometheus/model/value"
) )
type promlexer struct { type promlexer struct {

2
pkg/textparse/promparse_test.go → model/textparse/promparse_test.go
View file

@ -25,7 +25,7 @@ import (
"github.com/prometheus/common/model" "github.com/prometheus/common/model"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"github.com/prometheus/prometheus/pkg/labels" "github.com/prometheus/prometheus/model/labels"
) )
func TestPromParse(t *testing.T) { func TestPromParse(t *testing.T) {

0
pkg/textparse/promtestdata.nometa.txt → model/textparse/promtestdata.nometa.txt
View file

0
pkg/textparse/promtestdata.txt → model/textparse/promtestdata.txt
View file

0
pkg/timestamp/timestamp.go → model/timestamp/timestamp.go
View file

0
pkg/value/value.go → model/value/value.go
View file

4
notifier/notifier.go
View file

@ -41,8 +41,8 @@ import (
"github.com/prometheus/prometheus/config" "github.com/prometheus/prometheus/config"
"github.com/prometheus/prometheus/discovery/targetgroup" "github.com/prometheus/prometheus/discovery/targetgroup"
"github.com/prometheus/prometheus/pkg/labels" "github.com/prometheus/prometheus/model/labels"
"github.com/prometheus/prometheus/pkg/relabel" "github.com/prometheus/prometheus/model/relabel"
) )
const ( const (

4
notifier/notifier_test.go
View file

@ -35,8 +35,8 @@ import (
"github.com/prometheus/prometheus/config" "github.com/prometheus/prometheus/config"
"github.com/prometheus/prometheus/discovery/targetgroup" "github.com/prometheus/prometheus/discovery/targetgroup"
"github.com/prometheus/prometheus/pkg/labels" "github.com/prometheus/prometheus/model/labels"
"github.com/prometheus/prometheus/pkg/relabel" "github.com/prometheus/prometheus/model/relabel"
) )
func TestPostPath(t *testing.T) { func TestPostPath(t *testing.T) {

3
pkg/README.md
View file

@ -1,3 +0,0 @@
The `pkg` directory is deprecated.
Please do not add new packages to this directory.
Existing packages will be moved elsewhere eventually.

2
promql/bench_test.go
View file

@ -21,7 +21,7 @@ import (
"testing" "testing"
"time" "time"
"github.com/prometheus/prometheus/pkg/labels" "github.com/prometheus/prometheus/model/labels"
"github.com/prometheus/prometheus/promql/parser" "github.com/prometheus/prometheus/promql/parser"
"github.com/prometheus/prometheus/storage" "github.com/prometheus/prometheus/storage"
"github.com/prometheus/prometheus/util/teststorage" "github.com/prometheus/prometheus/util/teststorage"

6
promql/engine.go
View file

@ -35,9 +35,9 @@ import (
"github.com/prometheus/common/model" "github.com/prometheus/common/model"
"github.com/uber/jaeger-client-go" "github.com/uber/jaeger-client-go"
"github.com/prometheus/prometheus/pkg/labels" "github.com/prometheus/prometheus/model/labels"
"github.com/prometheus/prometheus/pkg/timestamp" "github.com/prometheus/prometheus/model/timestamp"
"github.com/prometheus/prometheus/pkg/value" "github.com/prometheus/prometheus/model/value"
"github.com/prometheus/prometheus/promql/parser" "github.com/prometheus/prometheus/promql/parser"
"github.com/prometheus/prometheus/storage" "github.com/prometheus/prometheus/storage"
"github.com/prometheus/prometheus/util/stats" "github.com/prometheus/prometheus/util/stats"

4
promql/engine_test.go
View file

@ -26,8 +26,8 @@ import (
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"go.uber.org/goleak" "go.uber.org/goleak"
"github.com/prometheus/prometheus/pkg/labels" "github.com/prometheus/prometheus/model/labels"
"github.com/prometheus/prometheus/pkg/timestamp" "github.com/prometheus/prometheus/model/timestamp"
"github.com/prometheus/prometheus/promql/parser" "github.com/prometheus/prometheus/promql/parser"
"github.com/prometheus/prometheus/storage" "github.com/prometheus/prometheus/storage"
) )

2
promql/functions.go
View file

@ -24,7 +24,7 @@ import (
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/prometheus/common/model" "github.com/prometheus/common/model"
"github.com/prometheus/prometheus/pkg/labels" "github.com/prometheus/prometheus/model/labels"
"github.com/prometheus/prometheus/promql/parser" "github.com/prometheus/prometheus/promql/parser"
) )

4
promql/functions_test.go
View file

@ -21,8 +21,8 @@ import (
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"github.com/prometheus/prometheus/pkg/labels" "github.com/prometheus/prometheus/model/labels"
"github.com/prometheus/prometheus/pkg/timestamp" "github.com/prometheus/prometheus/model/timestamp"
"github.com/prometheus/prometheus/promql/parser" "github.com/prometheus/prometheus/promql/parser"
"github.com/prometheus/prometheus/util/teststorage" "github.com/prometheus/prometheus/util/teststorage"
) )

2
promql/fuzz.go
View file

@ -20,7 +20,7 @@ package promql
import ( import (
"io" "io"
"github.com/prometheus/prometheus/pkg/textparse" "github.com/prometheus/prometheus/model/textparse"
"github.com/prometheus/prometheus/promql/parser" "github.com/prometheus/prometheus/promql/parser"
) )

2
promql/parser/ast.go
View file

@ -19,7 +19,7 @@ import (
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/prometheus/prometheus/pkg/labels" "github.com/prometheus/prometheus/model/labels"
"github.com/prometheus/prometheus/storage" "github.com/prometheus/prometheus/storage"
) )

4
promql/parser/generated_parser.y
View file

@ -20,8 +20,8 @@ import (
"strconv" "strconv"
"time" "time"
"github.com/prometheus/prometheus/pkg/labels" "github.com/prometheus/prometheus/model/labels"
"github.com/prometheus/prometheus/pkg/value" "github.com/prometheus/prometheus/model/value"
) )
%} %}

4
promql/parser/generated_parser.y.go
View file

@ -13,8 +13,8 @@ import (
"strconv" "strconv"
"time" "time"
"github.com/prometheus/prometheus/pkg/labels" "github.com/prometheus/prometheus/model/labels"
"github.com/prometheus/prometheus/pkg/value" "github.com/prometheus/prometheus/model/value"
) )
//line promql/parser/generated_parser.y:28 //line promql/parser/generated_parser.y:28

4
promql/parser/parse.go
View file

@ -26,8 +26,8 @@ import (
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/prometheus/common/model" "github.com/prometheus/common/model"
"github.com/prometheus/prometheus/pkg/labels" "github.com/prometheus/prometheus/model/labels"
"github.com/prometheus/prometheus/pkg/timestamp" "github.com/prometheus/prometheus/model/timestamp"
"github.com/prometheus/prometheus/util/strutil" "github.com/prometheus/prometheus/util/strutil"
) )

2
promql/parser/parse_test.go
View file

@ -24,7 +24,7 @@ import (
"github.com/prometheus/common/model" "github.com/prometheus/common/model"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"github.com/prometheus/prometheus/pkg/labels" "github.com/prometheus/prometheus/model/labels"
) )
var testExpr = []struct { var testExpr = []struct {

2
promql/parser/printer.go
View file

@ -21,7 +21,7 @@ import (
"github.com/prometheus/common/model" "github.com/prometheus/common/model"
"github.com/prometheus/prometheus/pkg/labels" "github.com/prometheus/prometheus/model/labels"
) )
// Tree returns a string of the tree structure of the given node. // Tree returns a string of the tree structure of the given node.

2
promql/parser/printer_test.go
View file

@ -18,7 +18,7 @@ import (
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"github.com/prometheus/prometheus/pkg/labels" "github.com/prometheus/prometheus/model/labels"
) )
func TestExprString(t *testing.T) { func TestExprString(t *testing.T) {

2
promql/quantile.go
View file

@ -17,7 +17,7 @@ import (
"math" "math"
"sort" "sort"
"github.com/prometheus/prometheus/pkg/labels" "github.com/prometheus/prometheus/model/labels"
) )
// Helpers to calculate quantiles. // Helpers to calculate quantiles.

6
promql/test.go
View file

@ -27,9 +27,9 @@ import (
"github.com/prometheus/common/model" "github.com/prometheus/common/model"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"github.com/prometheus/prometheus/pkg/exemplar" "github.com/prometheus/prometheus/model/exemplar"
"github.com/prometheus/prometheus/pkg/labels" "github.com/prometheus/prometheus/model/labels"
"github.com/prometheus/prometheus/pkg/timestamp" "github.com/prometheus/prometheus/model/timestamp"
"github.com/prometheus/prometheus/promql/parser" "github.com/prometheus/prometheus/promql/parser"
"github.com/prometheus/prometheus/storage" "github.com/prometheus/prometheus/storage"
"github.com/prometheus/prometheus/tsdb" "github.com/prometheus/prometheus/tsdb"

2
promql/test_test.go
View file

@ -20,7 +20,7 @@ import (
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"github.com/prometheus/prometheus/pkg/labels" "github.com/prometheus/prometheus/model/labels"
) )
func TestLazyLoader_WithSamplesTill(t *testing.T) { func TestLazyLoader_WithSamplesTill(t *testing.T) {

2
promql/value.go
View file

@ -21,7 +21,7 @@ import (
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/prometheus/prometheus/pkg/labels" "github.com/prometheus/prometheus/model/labels"
"github.com/prometheus/prometheus/promql/parser" "github.com/prometheus/prometheus/promql/parser"
"github.com/prometheus/prometheus/storage" "github.com/prometheus/prometheus/storage"
"github.com/prometheus/prometheus/tsdb/chunkenc" "github.com/prometheus/prometheus/tsdb/chunkenc"

6
rules/alerting.go
View file

@ -28,9 +28,9 @@ import (
"github.com/prometheus/common/model" "github.com/prometheus/common/model"
yaml "gopkg.in/yaml.v2" yaml "gopkg.in/yaml.v2"
"github.com/prometheus/prometheus/pkg/labels" "github.com/prometheus/prometheus/model/labels"
"github.com/prometheus/prometheus/pkg/rulefmt" "github.com/prometheus/prometheus/model/rulefmt"
"github.com/prometheus/prometheus/pkg/timestamp" "github.com/prometheus/prometheus/model/timestamp"
"github.com/prometheus/prometheus/promql" "github.com/prometheus/prometheus/promql"
"github.com/prometheus/prometheus/promql/parser" "github.com/prometheus/prometheus/promql/parser"
"github.com/prometheus/prometheus/template" "github.com/prometheus/prometheus/template"

4
rules/alerting_test.go
View file

@ -22,8 +22,8 @@ import (
"github.com/go-kit/log" "github.com/go-kit/log"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"github.com/prometheus/prometheus/pkg/labels" "github.com/prometheus/prometheus/model/labels"
"github.com/prometheus/prometheus/pkg/timestamp" "github.com/prometheus/prometheus/model/timestamp"
"github.com/prometheus/prometheus/promql" "github.com/prometheus/prometheus/promql"
"github.com/prometheus/prometheus/promql/parser" "github.com/prometheus/prometheus/promql/parser"
"github.com/prometheus/prometheus/util/teststorage" "github.com/prometheus/prometheus/util/teststorage"

8
rules/manager.go
View file

@ -29,10 +29,10 @@ import (
"github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus"
"github.com/prometheus/common/model" "github.com/prometheus/common/model"
"github.com/prometheus/prometheus/pkg/labels" "github.com/prometheus/prometheus/model/labels"
"github.com/prometheus/prometheus/pkg/rulefmt" "github.com/prometheus/prometheus/model/rulefmt"
"github.com/prometheus/prometheus/pkg/timestamp" "github.com/prometheus/prometheus/model/timestamp"
"github.com/prometheus/prometheus/pkg/value" "github.com/prometheus/prometheus/model/value"
"github.com/prometheus/prometheus/promql" "github.com/prometheus/prometheus/promql"
"github.com/prometheus/prometheus/promql/parser" "github.com/prometheus/prometheus/promql/parser"
"github.com/prometheus/prometheus/storage" "github.com/prometheus/prometheus/storage"

8
rules/manager_test.go
View file

@ -30,10 +30,10 @@ import (
"go.uber.org/goleak" "go.uber.org/goleak"
yaml "gopkg.in/yaml.v2" yaml "gopkg.in/yaml.v2"
"github.com/prometheus/prometheus/pkg/labels" "github.com/prometheus/prometheus/model/labels"
"github.com/prometheus/prometheus/pkg/rulefmt" "github.com/prometheus/prometheus/model/rulefmt"
"github.com/prometheus/prometheus/pkg/timestamp" "github.com/prometheus/prometheus/model/timestamp"
"github.com/prometheus/prometheus/pkg/value" "github.com/prometheus/prometheus/model/value"
"github.com/prometheus/prometheus/promql" "github.com/prometheus/prometheus/promql"
"github.com/prometheus/prometheus/promql/parser" "github.com/prometheus/prometheus/promql/parser"
"github.com/prometheus/prometheus/storage" "github.com/prometheus/prometheus/storage"

4
rules/recording.go
View file

@ -23,8 +23,8 @@ import (
yaml "gopkg.in/yaml.v2" yaml "gopkg.in/yaml.v2"
"github.com/prometheus/prometheus/pkg/labels" "github.com/prometheus/prometheus/model/labels"
"github.com/prometheus/prometheus/pkg/rulefmt" "github.com/prometheus/prometheus/model/rulefmt"
"github.com/prometheus/prometheus/promql" "github.com/prometheus/prometheus/promql"
"github.com/prometheus/prometheus/promql/parser" "github.com/prometheus/prometheus/promql/parser"
"github.com/prometheus/prometheus/util/strutil" "github.com/prometheus/prometheus/util/strutil"

4
rules/recording_test.go
View file

@ -21,8 +21,8 @@ import (
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"github.com/prometheus/prometheus/pkg/labels" "github.com/prometheus/prometheus/model/labels"
"github.com/prometheus/prometheus/pkg/timestamp" "github.com/prometheus/prometheus/model/timestamp"
"github.com/prometheus/prometheus/promql" "github.com/prometheus/prometheus/promql"
"github.com/prometheus/prometheus/promql/parser" "github.com/prometheus/prometheus/promql/parser"
"github.com/prometheus/prometheus/util/teststorage" "github.com/prometheus/prometheus/util/teststorage"

4
scrape/helpers_test.go
View file

@ -17,8 +17,8 @@ import (
"context" "context"
"math/rand" "math/rand"
"github.com/prometheus/prometheus/pkg/exemplar" "github.com/prometheus/prometheus/model/exemplar"
"github.com/prometheus/prometheus/pkg/labels" "github.com/prometheus/prometheus/model/labels"
"github.com/prometheus/prometheus/storage" "github.com/prometheus/prometheus/storage"
) )

2
scrape/manager.go
View file

@ -27,7 +27,7 @@ import (
"github.com/prometheus/prometheus/config" "github.com/prometheus/prometheus/config"
"github.com/prometheus/prometheus/discovery/targetgroup" "github.com/prometheus/prometheus/discovery/targetgroup"
"github.com/prometheus/prometheus/pkg/labels" "github.com/prometheus/prometheus/model/labels"
"github.com/prometheus/prometheus/storage" "github.com/prometheus/prometheus/storage"
"github.com/prometheus/prometheus/util/osutil" "github.com/prometheus/prometheus/util/osutil"
) )

4
scrape/manager_test.go
View file

@ -25,8 +25,8 @@ import (
"github.com/prometheus/prometheus/config" "github.com/prometheus/prometheus/config"
"github.com/prometheus/prometheus/discovery/targetgroup" "github.com/prometheus/prometheus/discovery/targetgroup"
"github.com/prometheus/prometheus/pkg/labels" "github.com/prometheus/prometheus/model/labels"
"github.com/prometheus/prometheus/pkg/relabel" "github.com/prometheus/prometheus/model/relabel"
) )
func TestPopulateLabels(t *testing.T) { func TestPopulateLabels(t *testing.T) {

14
scrape/scrape.go
View file

@ -40,14 +40,14 @@ import (
"github.com/prometheus/prometheus/config" "github.com/prometheus/prometheus/config"
"github.com/prometheus/prometheus/discovery/targetgroup" "github.com/prometheus/prometheus/discovery/targetgroup"
"github.com/prometheus/prometheus/pkg/exemplar" "github.com/prometheus/prometheus/model/exemplar"
"github.com/prometheus/prometheus/pkg/labels" "github.com/prometheus/prometheus/model/labels"
"github.com/prometheus/prometheus/pkg/pool" "github.com/prometheus/prometheus/model/relabel"
"github.com/prometheus/prometheus/pkg/relabel" "github.com/prometheus/prometheus/model/textparse"
"github.com/prometheus/prometheus/pkg/textparse" "github.com/prometheus/prometheus/model/timestamp"
"github.com/prometheus/prometheus/pkg/timestamp" "github.com/prometheus/prometheus/model/value"
"github.com/prometheus/prometheus/pkg/value"
"github.com/prometheus/prometheus/storage" "github.com/prometheus/prometheus/storage"
"github.com/prometheus/prometheus/util/pool"
) )
// ScrapeTimestampTolerance is the tolerance for scrape appends timestamps // ScrapeTimestampTolerance is the tolerance for scrape appends timestamps

12
scrape/scrape_test.go
View file

@ -38,12 +38,12 @@ import (
"github.com/prometheus/prometheus/config" "github.com/prometheus/prometheus/config"
"github.com/prometheus/prometheus/discovery/targetgroup" "github.com/prometheus/prometheus/discovery/targetgroup"
"github.com/prometheus/prometheus/pkg/exemplar" "github.com/prometheus/prometheus/model/exemplar"
"github.com/prometheus/prometheus/pkg/labels" "github.com/prometheus/prometheus/model/labels"
"github.com/prometheus/prometheus/pkg/relabel" "github.com/prometheus/prometheus/model/relabel"
"github.com/prometheus/prometheus/pkg/textparse" "github.com/prometheus/prometheus/model/textparse"
"github.com/prometheus/prometheus/pkg/timestamp" "github.com/prometheus/prometheus/model/timestamp"
"github.com/prometheus/prometheus/pkg/value" "github.com/prometheus/prometheus/model/value"
"github.com/prometheus/prometheus/storage" "github.com/prometheus/prometheus/storage"
"github.com/prometheus/prometheus/util/teststorage" "github.com/prometheus/prometheus/util/teststorage"
"github.com/prometheus/prometheus/util/testutil" "github.com/prometheus/prometheus/util/testutil"

8
scrape/target.go
View file

@ -27,10 +27,10 @@ import (
"github.com/prometheus/prometheus/config" "github.com/prometheus/prometheus/config"
"github.com/prometheus/prometheus/discovery/targetgroup" "github.com/prometheus/prometheus/discovery/targetgroup"
"github.com/prometheus/prometheus/pkg/labels" "github.com/prometheus/prometheus/model/labels"
"github.com/prometheus/prometheus/pkg/relabel" "github.com/prometheus/prometheus/model/relabel"
"github.com/prometheus/prometheus/pkg/textparse" "github.com/prometheus/prometheus/model/textparse"
"github.com/prometheus/prometheus/pkg/value" "github.com/prometheus/prometheus/model/value"
"github.com/prometheus/prometheus/storage" "github.com/prometheus/prometheus/storage"
) )

2
scrape/target_test.go
View file

@ -31,7 +31,7 @@ import (
"github.com/prometheus/prometheus/config" "github.com/prometheus/prometheus/config"
"github.com/prometheus/prometheus/discovery/targetgroup" "github.com/prometheus/prometheus/discovery/targetgroup"
"github.com/prometheus/prometheus/pkg/labels" "github.com/prometheus/prometheus/model/labels"
) )
const ( const (

4
storage/fanout.go
View file

@ -20,8 +20,8 @@ import (
"github.com/go-kit/log/level" "github.com/go-kit/log/level"
"github.com/prometheus/common/model" "github.com/prometheus/common/model"
"github.com/prometheus/prometheus/pkg/exemplar" "github.com/prometheus/prometheus/model/exemplar"
"github.com/prometheus/prometheus/pkg/labels" "github.com/prometheus/prometheus/model/labels"
tsdb_errors "github.com/prometheus/prometheus/tsdb/errors" tsdb_errors "github.com/prometheus/prometheus/tsdb/errors"
) )

2
storage/fanout_test.go
View file

@ -21,7 +21,7 @@ import (
"github.com/prometheus/common/model" "github.com/prometheus/common/model"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"github.com/prometheus/prometheus/pkg/labels" "github.com/prometheus/prometheus/model/labels"
"github.com/prometheus/prometheus/storage" "github.com/prometheus/prometheus/storage"
"github.com/prometheus/prometheus/util/teststorage" "github.com/prometheus/prometheus/util/teststorage"
) )

2
storage/generic.go
View file

@ -17,7 +17,7 @@
package storage package storage
import ( import (
"github.com/prometheus/prometheus/pkg/labels" "github.com/prometheus/prometheus/model/labels"
) )
type genericQuerier interface { type genericQuerier interface {

4
storage/interface.go
View file

@ -18,8 +18,8 @@ import (
"errors" "errors"
"fmt" "fmt"
"github.com/prometheus/prometheus/pkg/exemplar" "github.com/prometheus/prometheus/model/exemplar"
"github.com/prometheus/prometheus/pkg/labels" "github.com/prometheus/prometheus/model/labels"
"github.com/prometheus/prometheus/tsdb/chunkenc" "github.com/prometheus/prometheus/tsdb/chunkenc"
"github.com/prometheus/prometheus/tsdb/chunks" "github.com/prometheus/prometheus/tsdb/chunks"
) )

2
storage/merge.go
View file

@ -22,7 +22,7 @@ import (
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/prometheus/prometheus/pkg/labels" "github.com/prometheus/prometheus/model/labels"
"github.com/prometheus/prometheus/tsdb/chunkenc" "github.com/prometheus/prometheus/tsdb/chunkenc"
"github.com/prometheus/prometheus/tsdb/chunks" "github.com/prometheus/prometheus/tsdb/chunks"
tsdb_errors "github.com/prometheus/prometheus/tsdb/errors" tsdb_errors "github.com/prometheus/prometheus/tsdb/errors"

2
storage/merge_test.go
View file

@ -23,7 +23,7 @@ import (
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"github.com/prometheus/prometheus/pkg/labels" "github.com/prometheus/prometheus/model/labels"
"github.com/prometheus/prometheus/tsdb/chunkenc" "github.com/prometheus/prometheus/tsdb/chunkenc"
"github.com/prometheus/prometheus/tsdb/tsdbutil" "github.com/prometheus/prometheus/tsdb/tsdbutil"
) )

2
storage/noop.go
View file

@ -14,7 +14,7 @@
package storage package storage
import ( import (
"github.com/prometheus/prometheus/pkg/labels" "github.com/prometheus/prometheus/model/labels"
) )
type noopQuerier struct{} type noopQuerier struct{}

6
storage/remote/codec.go
View file

@ -26,9 +26,9 @@ import (
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/prometheus/common/model" "github.com/prometheus/common/model"
"github.com/prometheus/prometheus/pkg/exemplar" "github.com/prometheus/prometheus/model/exemplar"
"github.com/prometheus/prometheus/pkg/labels" "github.com/prometheus/prometheus/model/labels"
"github.com/prometheus/prometheus/pkg/textparse" "github.com/prometheus/prometheus/model/textparse"
"github.com/prometheus/prometheus/prompb" "github.com/prometheus/prometheus/prompb"
"github.com/prometheus/prometheus/storage" "github.com/prometheus/prometheus/storage"
"github.com/prometheus/prometheus/tsdb/chunkenc" "github.com/prometheus/prometheus/tsdb/chunkenc"

4
storage/remote/codec_test.go
View file

@ -20,8 +20,8 @@ import (
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"github.com/prometheus/prometheus/pkg/labels" "github.com/prometheus/prometheus/model/labels"
"github.com/prometheus/prometheus/pkg/textparse" "github.com/prometheus/prometheus/model/textparse"
"github.com/prometheus/prometheus/prompb" "github.com/prometheus/prometheus/prompb"
"github.com/prometheus/prometheus/storage" "github.com/prometheus/prometheus/storage"
) )

2
storage/remote/metadata_watcher_test.go
View file

@ -22,7 +22,7 @@ import (
"github.com/prometheus/common/model" "github.com/prometheus/common/model"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"github.com/prometheus/prometheus/pkg/textparse" "github.com/prometheus/prometheus/model/textparse"
"github.com/prometheus/prometheus/scrape" "github.com/prometheus/prometheus/scrape"
) )

4
storage/remote/queue_manager.go
View file

@ -31,8 +31,8 @@ import (
"go.uber.org/atomic" "go.uber.org/atomic"
"github.com/prometheus/prometheus/config" "github.com/prometheus/prometheus/config"
"github.com/prometheus/prometheus/pkg/labels" "github.com/prometheus/prometheus/model/labels"
"github.com/prometheus/prometheus/pkg/relabel" "github.com/prometheus/prometheus/model/relabel"
"github.com/prometheus/prometheus/prompb" "github.com/prometheus/prometheus/prompb"
"github.com/prometheus/prometheus/scrape" "github.com/prometheus/prometheus/scrape"
"github.com/prometheus/prometheus/tsdb/chunks" "github.com/prometheus/prometheus/tsdb/chunks"

6
storage/remote/queue_manager_test.go
View file

@ -38,9 +38,9 @@ import (
"go.uber.org/atomic" "go.uber.org/atomic"
"github.com/prometheus/prometheus/config" "github.com/prometheus/prometheus/config"
"github.com/prometheus/prometheus/pkg/labels" "github.com/prometheus/prometheus/model/labels"
"github.com/prometheus/prometheus/pkg/textparse" "github.com/prometheus/prometheus/model/textparse"
"github.com/prometheus/prometheus/pkg/timestamp" "github.com/prometheus/prometheus/model/timestamp"
"github.com/prometheus/prometheus/prompb" "github.com/prometheus/prometheus/prompb"
"github.com/prometheus/prometheus/scrape" "github.com/prometheus/prometheus/scrape"
"github.com/prometheus/prometheus/tsdb/chunks" "github.com/prometheus/prometheus/tsdb/chunks"

2
storage/remote/read.go
View file

@ -18,7 +18,7 @@ import (
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/prometheus/prometheus/pkg/labels" "github.com/prometheus/prometheus/model/labels"
"github.com/prometheus/prometheus/storage" "github.com/prometheus/prometheus/storage"
) )

4
storage/remote/read_handler.go
View file

@ -23,10 +23,10 @@ import (
"github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus"
"github.com/prometheus/prometheus/config" "github.com/prometheus/prometheus/config"
"github.com/prometheus/prometheus/pkg/gate" "github.com/prometheus/prometheus/model/labels"
"github.com/prometheus/prometheus/pkg/labels"
"github.com/prometheus/prometheus/prompb" "github.com/prometheus/prometheus/prompb"
"github.com/prometheus/prometheus/storage" "github.com/prometheus/prometheus/storage"
"github.com/prometheus/prometheus/util/gate"
) )
type readHandler struct { type readHandler struct {

2
storage/remote/read_handler_test.go
View file

@ -26,7 +26,7 @@ import (
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"github.com/prometheus/prometheus/config" "github.com/prometheus/prometheus/config"
"github.com/prometheus/prometheus/pkg/labels" "github.com/prometheus/prometheus/model/labels"
"github.com/prometheus/prometheus/prompb" "github.com/prometheus/prometheus/prompb"
"github.com/prometheus/prometheus/promql" "github.com/prometheus/prometheus/promql"
"github.com/prometheus/prometheus/storage" "github.com/prometheus/prometheus/storage"

2
storage/remote/read_test.go
View file

@ -27,7 +27,7 @@ import (
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"github.com/prometheus/prometheus/config" "github.com/prometheus/prometheus/config"
"github.com/prometheus/prometheus/pkg/labels" "github.com/prometheus/prometheus/model/labels"
"github.com/prometheus/prometheus/prompb" "github.com/prometheus/prometheus/prompb"
"github.com/prometheus/prometheus/storage" "github.com/prometheus/prometheus/storage"
) )

Some files were not shown because too many files have changed in this diff Show more