Move pkg/ to util/

This commit is contained in:
Fabian Reinartz 2015-05-29 13:30:30 +02:00
parent 027d8968d5
commit 0de6edbdfc
34 changed files with 22 additions and 22 deletions

View file

@ -12,7 +12,7 @@ import (
clientmodel "github.com/prometheus/client_golang/model" clientmodel "github.com/prometheus/client_golang/model"
"github.com/prometheus/prometheus/pkg/strutil" "github.com/prometheus/prometheus/util/strutil"
) )
var ( var (

View file

@ -28,7 +28,7 @@ import (
clientmodel "github.com/prometheus/client_golang/model" clientmodel "github.com/prometheus/client_golang/model"
"github.com/prometheus/prometheus/pkg/httputil" "github.com/prometheus/prometheus/util/httputil"
) )
const ( const (

View file

@ -25,9 +25,9 @@ import (
clientmodel "github.com/prometheus/client_golang/model" clientmodel "github.com/prometheus/client_golang/model"
"github.com/prometheus/prometheus/pkg/stats"
"github.com/prometheus/prometheus/storage/local" "github.com/prometheus/prometheus/storage/local"
"github.com/prometheus/prometheus/storage/metric" "github.com/prometheus/prometheus/storage/metric"
"github.com/prometheus/prometheus/util/stats"
) )
var ( var (

View file

@ -21,8 +21,8 @@ import (
"time" "time"
clientmodel "github.com/prometheus/client_golang/model" clientmodel "github.com/prometheus/client_golang/model"
"github.com/prometheus/prometheus/pkg/strutil"
"github.com/prometheus/prometheus/storage/metric" "github.com/prometheus/prometheus/storage/metric"
"github.com/prometheus/prometheus/util/strutil"
) )
type parser struct { type parser struct {

View file

@ -21,8 +21,8 @@ import (
clientmodel "github.com/prometheus/client_golang/model" clientmodel "github.com/prometheus/client_golang/model"
"github.com/prometheus/prometheus/pkg/strutil"
"github.com/prometheus/prometheus/storage/metric" "github.com/prometheus/prometheus/storage/metric"
"github.com/prometheus/prometheus/util/strutil"
) )
func (matrix Matrix) String() string { func (matrix Matrix) String() string {

View file

@ -24,11 +24,11 @@ import (
clientmodel "github.com/prometheus/client_golang/model" clientmodel "github.com/prometheus/client_golang/model"
"github.com/prometheus/prometheus/pkg/strutil"
"github.com/prometheus/prometheus/pkg/testutil"
"github.com/prometheus/prometheus/storage" "github.com/prometheus/prometheus/storage"
"github.com/prometheus/prometheus/storage/local" "github.com/prometheus/prometheus/storage/local"
"github.com/prometheus/prometheus/storage/metric" "github.com/prometheus/prometheus/storage/metric"
"github.com/prometheus/prometheus/util/strutil"
"github.com/prometheus/prometheus/util/testutil"
) )
var ( var (

View file

@ -30,8 +30,8 @@ import (
clientmodel "github.com/prometheus/client_golang/model" clientmodel "github.com/prometheus/client_golang/model"
"github.com/prometheus/prometheus/config" "github.com/prometheus/prometheus/config"
"github.com/prometheus/prometheus/pkg/httputil"
"github.com/prometheus/prometheus/storage" "github.com/prometheus/prometheus/storage"
"github.com/prometheus/prometheus/util/httputil"
) )
const ( const (

View file

@ -26,7 +26,7 @@ import (
clientmodel "github.com/prometheus/client_golang/model" clientmodel "github.com/prometheus/client_golang/model"
"github.com/prometheus/prometheus/pkg/httputil" "github.com/prometheus/prometheus/util/httputil"
) )
func TestBaseLabels(t *testing.T) { func TestBaseLabels(t *testing.T) {

View file

@ -22,8 +22,8 @@ import (
clientmodel "github.com/prometheus/client_golang/model" clientmodel "github.com/prometheus/client_golang/model"
"github.com/prometheus/prometheus/pkg/strutil"
"github.com/prometheus/prometheus/promql" "github.com/prometheus/prometheus/promql"
"github.com/prometheus/prometheus/util/strutil"
) )
const ( const (

View file

@ -28,10 +28,10 @@ import (
"github.com/prometheus/prometheus/config" "github.com/prometheus/prometheus/config"
"github.com/prometheus/prometheus/notification" "github.com/prometheus/prometheus/notification"
"github.com/prometheus/prometheus/pkg/strutil"
"github.com/prometheus/prometheus/promql" "github.com/prometheus/prometheus/promql"
"github.com/prometheus/prometheus/storage" "github.com/prometheus/prometheus/storage"
"github.com/prometheus/prometheus/template" "github.com/prometheus/prometheus/template"
"github.com/prometheus/prometheus/util/strutil"
) )
// Constants for instrumentation. // Constants for instrumentation.

View file

@ -20,8 +20,8 @@ import (
clientmodel "github.com/prometheus/client_golang/model" clientmodel "github.com/prometheus/client_golang/model"
"github.com/prometheus/prometheus/pkg/strutil"
"github.com/prometheus/prometheus/promql" "github.com/prometheus/prometheus/promql"
"github.com/prometheus/prometheus/util/strutil"
) )
// A RecordingRule records its vector expression into new timeseries. // A RecordingRule records its vector expression into new timeseries.

View file

@ -33,10 +33,10 @@ import (
clientmodel "github.com/prometheus/client_golang/model" clientmodel "github.com/prometheus/client_golang/model"
"github.com/prometheus/prometheus/pkg/flock"
"github.com/prometheus/prometheus/storage/local/codable" "github.com/prometheus/prometheus/storage/local/codable"
"github.com/prometheus/prometheus/storage/local/index" "github.com/prometheus/prometheus/storage/local/index"
"github.com/prometheus/prometheus/storage/metric" "github.com/prometheus/prometheus/storage/metric"
"github.com/prometheus/prometheus/util/flock"
) )
const ( const (

View file

@ -20,10 +20,10 @@ import (
clientmodel "github.com/prometheus/client_golang/model" clientmodel "github.com/prometheus/client_golang/model"
"github.com/prometheus/prometheus/pkg/testutil"
"github.com/prometheus/prometheus/storage/local/codable" "github.com/prometheus/prometheus/storage/local/codable"
"github.com/prometheus/prometheus/storage/local/index" "github.com/prometheus/prometheus/storage/local/index"
"github.com/prometheus/prometheus/storage/metric" "github.com/prometheus/prometheus/storage/metric"
"github.com/prometheus/prometheus/util/testutil"
) )
var ( var (

View file

@ -24,8 +24,8 @@ import (
clientmodel "github.com/prometheus/client_golang/model" clientmodel "github.com/prometheus/client_golang/model"
"github.com/prometheus/prometheus/pkg/testutil"
"github.com/prometheus/prometheus/storage/metric" "github.com/prometheus/prometheus/storage/metric"
"github.com/prometheus/prometheus/util/testutil"
) )
func TestFingerprintsForLabelMatchers(t *testing.T) { func TestFingerprintsForLabelMatchers(t *testing.T) {

View file

@ -21,7 +21,7 @@ package local
import ( import (
"time" "time"
"github.com/prometheus/prometheus/pkg/testutil" "github.com/prometheus/prometheus/util/testutil"
) )
type testStorageCloser struct { type testStorageCloser struct {

View file

@ -28,7 +28,7 @@ import (
clientmodel "github.com/prometheus/client_golang/model" clientmodel "github.com/prometheus/client_golang/model"
"github.com/prometheus/prometheus/pkg/httputil" "github.com/prometheus/prometheus/util/httputil"
) )
const ( const (

View file

@ -28,7 +28,7 @@ import (
clientmodel "github.com/prometheus/client_golang/model" clientmodel "github.com/prometheus/client_golang/model"
"github.com/prometheus/prometheus/pkg/httputil" "github.com/prometheus/prometheus/util/httputil"
) )
const ( const (

View file

@ -27,8 +27,8 @@ import (
clientmodel "github.com/prometheus/client_golang/model" clientmodel "github.com/prometheus/client_golang/model"
"github.com/prometheus/prometheus/pkg/strutil"
"github.com/prometheus/prometheus/promql" "github.com/prometheus/prometheus/promql"
"github.com/prometheus/prometheus/util/strutil"
) )
// A version of vector that's easier to use from templates. // A version of vector that's easier to use from templates.

View file

@ -5,7 +5,7 @@ import (
"path/filepath" "path/filepath"
"testing" "testing"
"github.com/prometheus/prometheus/pkg/testutil" "github.com/prometheus/prometheus/util/testutil"
) )
func TestLocking(t *testing.T) { func TestLocking(t *testing.T) {

View file

@ -20,9 +20,9 @@ import (
clientmodel "github.com/prometheus/client_golang/model" clientmodel "github.com/prometheus/client_golang/model"
"github.com/prometheus/prometheus/pkg/httputil"
"github.com/prometheus/prometheus/promql" "github.com/prometheus/prometheus/promql"
"github.com/prometheus/prometheus/storage/local" "github.com/prometheus/prometheus/storage/local"
"github.com/prometheus/prometheus/util/httputil"
) )
// MetricsService manages the /api HTTP endpoint. // MetricsService manages the /api HTTP endpoint.

View file

@ -26,7 +26,7 @@ import (
clientmodel "github.com/prometheus/client_golang/model" clientmodel "github.com/prometheus/client_golang/model"
"github.com/prometheus/prometheus/pkg/httputil" "github.com/prometheus/prometheus/util/httputil"
) )
// Enables cross-site script calls. // Enables cross-site script calls.