Move pkg/ to util/

adamron1 · Jun 1, 2015 · 0de6edb · 0de6edb
1 parent 027d896
commit 0de6edb
Show file tree

Hide file tree

Showing 34 changed files with 22 additions and 22 deletions.
diff --git a/config/config.go b/config/config.go
@@ -12,7 +12,7 @@ import (
 
 	clientmodel "github.com/prometheus/client_golang/model"
 
-	"github.com/prometheus/prometheus/pkg/strutil"
+	"github.com/prometheus/prometheus/util/strutil"
 )
 
 var (

diff --git a/notification/notification.go b/notification/notification.go
@@ -28,7 +28,7 @@ import (
 
 	clientmodel "github.com/prometheus/client_golang/model"
 
-	"github.com/prometheus/prometheus/pkg/httputil"
+	"github.com/prometheus/prometheus/util/httputil"
 )
 
 const (

diff --git a/promql/engine.go b/promql/engine.go
@@ -25,9 +25,9 @@ import (
 
 	clientmodel "github.com/prometheus/client_golang/model"
 
-	"github.com/prometheus/prometheus/pkg/stats"
 	"github.com/prometheus/prometheus/storage/local"
 	"github.com/prometheus/prometheus/storage/metric"
+	"github.com/prometheus/prometheus/util/stats"
 )
 
 var (

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

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

diff --git a/promql/test.go b/promql/test.go
@@ -24,11 +24,11 @@ import (
 
 	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/local"
 	"github.com/prometheus/prometheus/storage/metric"
+	"github.com/prometheus/prometheus/util/strutil"
+	"github.com/prometheus/prometheus/util/testutil"
 )
 
 var (

diff --git a/retrieval/target.go b/retrieval/target.go
@@ -30,8 +30,8 @@ import (
 	clientmodel "github.com/prometheus/client_golang/model"
 
 	"github.com/prometheus/prometheus/config"
-	"github.com/prometheus/prometheus/pkg/httputil"
 	"github.com/prometheus/prometheus/storage"
+	"github.com/prometheus/prometheus/util/httputil"
 )
 
 const (

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

diff --git a/rules/alerting.go b/rules/alerting.go
@@ -22,8 +22,8 @@ import (
 
 	clientmodel "github.com/prometheus/client_golang/model"
 
-	"github.com/prometheus/prometheus/pkg/strutil"
 	"github.com/prometheus/prometheus/promql"
+	"github.com/prometheus/prometheus/util/strutil"
 )
 
 const (

diff --git a/rules/manager.go b/rules/manager.go
@@ -28,10 +28,10 @@ import (
 
 	"github.com/prometheus/prometheus/config"
 	"github.com/prometheus/prometheus/notification"
-	"github.com/prometheus/prometheus/pkg/strutil"
 	"github.com/prometheus/prometheus/promql"
 	"github.com/prometheus/prometheus/storage"
 	"github.com/prometheus/prometheus/template"
+	"github.com/prometheus/prometheus/util/strutil"
 )
 
 // Constants for instrumentation.

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

diff --git a/storage/local/persistence.go b/storage/local/persistence.go
@@ -33,10 +33,10 @@ import (
 
 	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/index"
 	"github.com/prometheus/prometheus/storage/metric"
+	"github.com/prometheus/prometheus/util/flock"
 )
 
 const (

diff --git a/storage/local/persistence_test.go b/storage/local/persistence_test.go
@@ -20,10 +20,10 @@ import (
 
 	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/index"
 	"github.com/prometheus/prometheus/storage/metric"
+	"github.com/prometheus/prometheus/util/testutil"
 )
 
 var (

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

diff --git a/storage/local/test_helpers.go b/storage/local/test_helpers.go
@@ -21,7 +21,7 @@ package local
 import (
 	"time"
 
-	"github.com/prometheus/prometheus/pkg/testutil"
+	"github.com/prometheus/prometheus/util/testutil"
 )
 
 type testStorageCloser struct {

diff --git a/storage/remote/influxdb/client.go b/storage/remote/influxdb/client.go
@@ -28,7 +28,7 @@ import (
 
 	clientmodel "github.com/prometheus/client_golang/model"
 
-	"github.com/prometheus/prometheus/pkg/httputil"
+	"github.com/prometheus/prometheus/util/httputil"
 )
 
 const (

diff --git a/storage/remote/opentsdb/client.go b/storage/remote/opentsdb/client.go
@@ -28,7 +28,7 @@ import (
 
 	clientmodel "github.com/prometheus/client_golang/model"
 
-	"github.com/prometheus/prometheus/pkg/httputil"
+	"github.com/prometheus/prometheus/util/httputil"
 )
 
 const (

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

diff --git a/pkg/flock/flock.go → util/flock/flock.go b/pkg/flock/flock.go → util/flock/flock.go
diff --git a/pkg/flock/flock_plan9.go → util/flock/flock_plan9.go b/pkg/flock/flock_plan9.go → util/flock/flock_plan9.go
diff --git a/pkg/flock/flock_solaris.go → util/flock/flock_solaris.go b/pkg/flock/flock_solaris.go → util/flock/flock_solaris.go
diff --git a/pkg/flock/flock_test.go → util/flock/flock_test.go b/pkg/flock/flock_test.go → util/flock/flock_test.go
@@ -5,7 +5,7 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/prometheus/prometheus/pkg/testutil"
+	"github.com/prometheus/prometheus/util/testutil"
 )
 
 func TestLocking(t *testing.T) {

diff --git a/pkg/flock/flock_unix.go → util/flock/flock_unix.go b/pkg/flock/flock_unix.go → util/flock/flock_unix.go
diff --git a/pkg/flock/flock_windows.go → util/flock/flock_windows.go b/pkg/flock/flock_windows.go → util/flock/flock_windows.go
diff --git a/pkg/httputil/compression.go → util/httputil/compression.go b/pkg/httputil/compression.go → util/httputil/compression.go
diff --git a/pkg/httputil/deadline_client.go → util/httputil/deadline_client.go b/pkg/httputil/deadline_client.go → util/httputil/deadline_client.go
diff --git a/pkg/httputil/util.go → util/httputil/util.go b/pkg/httputil/util.go → util/httputil/util.go
diff --git a/pkg/stats/query_stats.go → util/stats/query_stats.go b/pkg/stats/query_stats.go → util/stats/query_stats.go
diff --git a/pkg/stats/timer.go → util/stats/timer.go b/pkg/stats/timer.go → util/stats/timer.go
diff --git a/pkg/strutil/strconv.go → util/strutil/strconv.go b/pkg/strutil/strconv.go → util/strutil/strconv.go
diff --git a/pkg/testutil/directory.go → util/testutil/directory.go b/pkg/testutil/directory.go → util/testutil/directory.go
diff --git a/pkg/testutil/error.go → util/testutil/error.go b/pkg/testutil/error.go → util/testutil/error.go
diff --git a/web/api/api.go b/web/api/api.go
@@ -20,9 +20,9 @@ import (
 
 	clientmodel "github.com/prometheus/client_golang/model"
 
-	"github.com/prometheus/prometheus/pkg/httputil"
 	"github.com/prometheus/prometheus/promql"
 	"github.com/prometheus/prometheus/storage/local"
+	"github.com/prometheus/prometheus/util/httputil"
 )
 
 // MetricsService manages the /api HTTP endpoint.

diff --git a/web/api/query.go b/web/api/query.go
@@ -26,7 +26,7 @@ import (
 
 	clientmodel "github.com/prometheus/client_golang/model"
 
-	"github.com/prometheus/prometheus/pkg/httputil"
+	"github.com/prometheus/prometheus/util/httputil"
 )
 
 // Enables cross-site script calls.
-Original file line number
+Diff line change
@@ Expand Up / @@ -12,7 +12,7 @@ import ( @@
     	clientmodel "github.com/prometheus/client_golang/model"
-    	"github.com/prometheus/prometheus/pkg/strutil"
+    	"github.com/prometheus/prometheus/util/strutil"
     )
     var (
@@ Expand Down @@