diff --git a/config/config.go b/config/config.go index 3dcc99f0a..f402b61ff 100644 --- 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 index b79e613ea..bad3fa8f2 100644 --- 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 index af9f5ff20..d9cf43eef 100644 --- 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 index e0aeff6a0..08fb83f47 100644 --- 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 index df72c47ef..4a3a8fded 100644 --- 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 index d0389065b..392a394dd 100644 --- 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 index 5a5b99285..772e8761a 100644 --- 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 index 0143a63c4..5b4231ae1 100644 --- 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 index 1e765665c..d7cf5545e 100644 --- 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 index a197d07f2..6ee51ab40 100644 --- 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 index 272463872..95bb3d262 100644 --- 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 index 90af92ae5..7e1844a68 100644 --- 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 index 97dcfb4b0..4327a177b 100644 --- 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 index 418af3e72..54c113378 100644 --- 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 index 44c71c4a1..beec6648a 100644 --- 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 index 5193a9061..c9dd6c5e3 100644 --- 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 index d710c5fb0..d6a3f53ec 100644 --- 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 index d310f0de0..e7060cc4e 100644 --- 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 b/util/flock/flock.go similarity index 100% rename from pkg/flock/flock.go rename to util/flock/flock.go diff --git a/pkg/flock/flock_plan9.go b/util/flock/flock_plan9.go similarity index 100% rename from pkg/flock/flock_plan9.go rename to util/flock/flock_plan9.go diff --git a/pkg/flock/flock_solaris.go b/util/flock/flock_solaris.go similarity index 100% rename from pkg/flock/flock_solaris.go rename to util/flock/flock_solaris.go diff --git a/pkg/flock/flock_test.go b/util/flock/flock_test.go similarity index 96% rename from pkg/flock/flock_test.go rename to util/flock/flock_test.go index 645276381..d29957af8 100644 --- a/pkg/flock/flock_test.go +++ b/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 b/util/flock/flock_unix.go similarity index 100% rename from pkg/flock/flock_unix.go rename to util/flock/flock_unix.go diff --git a/pkg/flock/flock_windows.go b/util/flock/flock_windows.go similarity index 100% rename from pkg/flock/flock_windows.go rename to util/flock/flock_windows.go diff --git a/pkg/httputil/compression.go b/util/httputil/compression.go similarity index 100% rename from pkg/httputil/compression.go rename to util/httputil/compression.go diff --git a/pkg/httputil/deadline_client.go b/util/httputil/deadline_client.go similarity index 100% rename from pkg/httputil/deadline_client.go rename to util/httputil/deadline_client.go diff --git a/pkg/httputil/util.go b/util/httputil/util.go similarity index 100% rename from pkg/httputil/util.go rename to util/httputil/util.go diff --git a/pkg/stats/query_stats.go b/util/stats/query_stats.go similarity index 100% rename from pkg/stats/query_stats.go rename to util/stats/query_stats.go diff --git a/pkg/stats/timer.go b/util/stats/timer.go similarity index 100% rename from pkg/stats/timer.go rename to util/stats/timer.go diff --git a/pkg/strutil/strconv.go b/util/strutil/strconv.go similarity index 100% rename from pkg/strutil/strconv.go rename to util/strutil/strconv.go diff --git a/pkg/testutil/directory.go b/util/testutil/directory.go similarity index 100% rename from pkg/testutil/directory.go rename to util/testutil/directory.go diff --git a/pkg/testutil/error.go b/util/testutil/error.go similarity index 100% rename from pkg/testutil/error.go rename to util/testutil/error.go diff --git a/web/api/api.go b/web/api/api.go index a11106fc9..1d28de3f8 100644 --- 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 index e22ec8d6d..128981b66 100644 --- 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.