diff --git a/cmd/prometheus/main.go b/cmd/prometheus/main.go index 8acecd9133..e3d7ac03a1 100644 --- a/cmd/prometheus/main.go +++ b/cmd/prometheus/main.go @@ -35,8 +35,8 @@ import ( "time" "github.com/alecthomas/units" - "github.com/go-kit/kit/log" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log" + "github.com/go-kit/log/level" conntrack "github.com/mwitkow/go-conntrack" "github.com/oklog/run" "github.com/opentracing/opentracing-go" diff --git a/cmd/prometheus/main_test.go b/cmd/prometheus/main_test.go index 17e930f417..182b6d228c 100644 --- a/cmd/prometheus/main_test.go +++ b/cmd/prometheus/main_test.go @@ -25,7 +25,7 @@ import ( "testing" "time" - "github.com/go-kit/kit/log" + "github.com/go-kit/log" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/common/model" "github.com/stretchr/testify/require" diff --git a/cmd/promtool/backfill.go b/cmd/promtool/backfill.go index c0fc627eec..6a43a85e4e 100644 --- a/cmd/promtool/backfill.go +++ b/cmd/promtool/backfill.go @@ -18,7 +18,7 @@ import ( "io" "math" - "github.com/go-kit/kit/log" + "github.com/go-kit/log" "github.com/pkg/errors" "github.com/prometheus/prometheus/pkg/labels" "github.com/prometheus/prometheus/pkg/textparse" diff --git a/cmd/promtool/main.go b/cmd/promtool/main.go index 01a7181e2a..06ce888309 100644 --- a/cmd/promtool/main.go +++ b/cmd/promtool/main.go @@ -28,7 +28,7 @@ import ( "strings" "time" - "github.com/go-kit/kit/log" + "github.com/go-kit/log" "github.com/google/pprof/profile" "github.com/pkg/errors" "github.com/prometheus/client_golang/api" diff --git a/cmd/promtool/rules.go b/cmd/promtool/rules.go index a97e45b680..75faa1b604 100644 --- a/cmd/promtool/rules.go +++ b/cmd/promtool/rules.go @@ -18,8 +18,8 @@ import ( "fmt" "time" - "github.com/go-kit/kit/log" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log" + "github.com/go-kit/log/level" "github.com/pkg/errors" v1 "github.com/prometheus/client_golang/api/prometheus/v1" "github.com/prometheus/common/model" diff --git a/cmd/promtool/rules_test.go b/cmd/promtool/rules_test.go index c6bc667e8d..ac326841f0 100644 --- a/cmd/promtool/rules_test.go +++ b/cmd/promtool/rules_test.go @@ -22,7 +22,7 @@ import ( "testing" "time" - "github.com/go-kit/kit/log" + "github.com/go-kit/log" v1 "github.com/prometheus/client_golang/api/prometheus/v1" "github.com/prometheus/common/model" "github.com/prometheus/prometheus/pkg/labels" diff --git a/cmd/promtool/tsdb.go b/cmd/promtool/tsdb.go index 8714377953..4a1e7eacb7 100644 --- a/cmd/promtool/tsdb.go +++ b/cmd/promtool/tsdb.go @@ -31,7 +31,7 @@ import ( "time" "github.com/alecthomas/units" - "github.com/go-kit/kit/log" + "github.com/go-kit/log" "github.com/pkg/errors" "github.com/prometheus/prometheus/pkg/labels" diff --git a/cmd/promtool/unittest.go b/cmd/promtool/unittest.go index 624dd5ba5d..44cffd3016 100644 --- a/cmd/promtool/unittest.go +++ b/cmd/promtool/unittest.go @@ -25,7 +25,7 @@ import ( "strings" "time" - "github.com/go-kit/kit/log" + "github.com/go-kit/log" "github.com/pkg/errors" "github.com/prometheus/common/model" yaml "gopkg.in/yaml.v2" diff --git a/config/config.go b/config/config.go index ce0deedff1..1648653c24 100644 --- a/config/config.go +++ b/config/config.go @@ -24,8 +24,8 @@ import ( "time" "github.com/alecthomas/units" - "github.com/go-kit/kit/log" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log" + "github.com/go-kit/log/level" "github.com/pkg/errors" "github.com/prometheus/common/config" "github.com/prometheus/common/model" diff --git a/config/config_test.go b/config/config_test.go index b9dbc750f5..5716e86445 100644 --- a/config/config_test.go +++ b/config/config_test.go @@ -24,7 +24,7 @@ import ( "time" "github.com/alecthomas/units" - "github.com/go-kit/kit/log" + "github.com/go-kit/log" "github.com/prometheus/common/config" "github.com/prometheus/common/model" "github.com/stretchr/testify/require" diff --git a/discovery/aws/ec2.go b/discovery/aws/ec2.go index fadf6f7661..c306c920b8 100644 --- a/discovery/aws/ec2.go +++ b/discovery/aws/ec2.go @@ -27,7 +27,7 @@ import ( "github.com/aws/aws-sdk-go/aws/ec2metadata" "github.com/aws/aws-sdk-go/aws/session" "github.com/aws/aws-sdk-go/service/ec2" - "github.com/go-kit/kit/log" + "github.com/go-kit/log" "github.com/pkg/errors" "github.com/prometheus/common/config" "github.com/prometheus/common/model" diff --git a/discovery/aws/lightsail.go b/discovery/aws/lightsail.go index 57e43ad590..e3dc65b5d6 100644 --- a/discovery/aws/lightsail.go +++ b/discovery/aws/lightsail.go @@ -27,7 +27,7 @@ import ( "github.com/aws/aws-sdk-go/aws/ec2metadata" "github.com/aws/aws-sdk-go/aws/session" "github.com/aws/aws-sdk-go/service/lightsail" - "github.com/go-kit/kit/log" + "github.com/go-kit/log" "github.com/pkg/errors" "github.com/prometheus/common/config" "github.com/prometheus/common/model" diff --git a/discovery/azure/azure.go b/discovery/azure/azure.go index 13ed0abe83..a23e80d8c3 100644 --- a/discovery/azure/azure.go +++ b/discovery/azure/azure.go @@ -27,8 +27,8 @@ import ( "github.com/Azure/go-autorest/autorest" "github.com/Azure/go-autorest/autorest/adal" "github.com/Azure/go-autorest/autorest/azure" - "github.com/go-kit/kit/log" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log" + "github.com/go-kit/log/level" "github.com/pkg/errors" config_util "github.com/prometheus/common/config" "github.com/prometheus/common/model" diff --git a/discovery/consul/consul.go b/discovery/consul/consul.go index 27a9ab14f1..c72d7b1bff 100644 --- a/discovery/consul/consul.go +++ b/discovery/consul/consul.go @@ -21,8 +21,8 @@ import ( "strings" "time" - "github.com/go-kit/kit/log" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log" + "github.com/go-kit/log/level" consul "github.com/hashicorp/consul/api" "github.com/pkg/errors" "github.com/prometheus/client_golang/prometheus" diff --git a/discovery/consul/consul_test.go b/discovery/consul/consul_test.go index afc387c0bb..9570474d27 100644 --- a/discovery/consul/consul_test.go +++ b/discovery/consul/consul_test.go @@ -21,7 +21,7 @@ import ( "testing" "time" - "github.com/go-kit/kit/log" + "github.com/go-kit/log" "github.com/prometheus/common/model" "github.com/stretchr/testify/require" "go.uber.org/goleak" diff --git a/discovery/digitalocean/digitalocean.go b/discovery/digitalocean/digitalocean.go index 67d8f50dcd..b887ada046 100644 --- a/discovery/digitalocean/digitalocean.go +++ b/discovery/digitalocean/digitalocean.go @@ -23,7 +23,7 @@ import ( "time" "github.com/digitalocean/godo" - "github.com/go-kit/kit/log" + "github.com/go-kit/log" "github.com/prometheus/common/config" "github.com/prometheus/common/model" "github.com/prometheus/common/version" diff --git a/discovery/digitalocean/digitalocean_test.go b/discovery/digitalocean/digitalocean_test.go index 97918745ed..a5da4b26e3 100644 --- a/discovery/digitalocean/digitalocean_test.go +++ b/discovery/digitalocean/digitalocean_test.go @@ -19,7 +19,7 @@ import ( "net/url" "testing" - "github.com/go-kit/kit/log" + "github.com/go-kit/log" "github.com/prometheus/common/model" "github.com/stretchr/testify/require" ) diff --git a/discovery/discovery.go b/discovery/discovery.go index 5b0402bdb0..f2b87d9925 100644 --- a/discovery/discovery.go +++ b/discovery/discovery.go @@ -17,7 +17,7 @@ import ( "context" "reflect" - "github.com/go-kit/kit/log" + "github.com/go-kit/log" "github.com/prometheus/common/config" "github.com/prometheus/prometheus/discovery/targetgroup" diff --git a/discovery/dns/dns.go b/discovery/dns/dns.go index 931c049347..6b9860d629 100644 --- a/discovery/dns/dns.go +++ b/discovery/dns/dns.go @@ -21,8 +21,8 @@ import ( "sync" "time" - "github.com/go-kit/kit/log" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log" + "github.com/go-kit/log/level" "github.com/miekg/dns" "github.com/pkg/errors" "github.com/prometheus/client_golang/prometheus" diff --git a/discovery/dns/dns_test.go b/discovery/dns/dns_test.go index 74726e0333..a2311fc2d9 100644 --- a/discovery/dns/dns_test.go +++ b/discovery/dns/dns_test.go @@ -20,7 +20,7 @@ import ( "testing" "time" - "github.com/go-kit/kit/log" + "github.com/go-kit/log" "github.com/miekg/dns" "github.com/prometheus/common/model" "github.com/stretchr/testify/require" diff --git a/discovery/eureka/eureka.go b/discovery/eureka/eureka.go index 80a9c99df9..dcfc2be102 100644 --- a/discovery/eureka/eureka.go +++ b/discovery/eureka/eureka.go @@ -21,7 +21,7 @@ import ( "strconv" "time" - "github.com/go-kit/kit/log" + "github.com/go-kit/log" "github.com/pkg/errors" "github.com/prometheus/common/config" "github.com/prometheus/common/model" diff --git a/discovery/file/file.go b/discovery/file/file.go index a7b046877b..088fa12d46 100644 --- a/discovery/file/file.go +++ b/discovery/file/file.go @@ -25,8 +25,8 @@ import ( "sync" "time" - "github.com/go-kit/kit/log" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log" + "github.com/go-kit/log/level" "github.com/pkg/errors" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/common/config" diff --git a/discovery/gce/gce.go b/discovery/gce/gce.go index 231c8fdd3f..53ee9943d5 100644 --- a/discovery/gce/gce.go +++ b/discovery/gce/gce.go @@ -21,7 +21,7 @@ import ( "strings" "time" - "github.com/go-kit/kit/log" + "github.com/go-kit/log" "github.com/pkg/errors" "github.com/prometheus/common/model" "golang.org/x/oauth2/google" diff --git a/discovery/hetzner/hcloud.go b/discovery/hetzner/hcloud.go index 3c0e8ba962..05471e4537 100644 --- a/discovery/hetzner/hcloud.go +++ b/discovery/hetzner/hcloud.go @@ -21,7 +21,7 @@ import ( "strconv" "time" - "github.com/go-kit/kit/log" + "github.com/go-kit/log" "github.com/hetznercloud/hcloud-go/hcloud" "github.com/prometheus/common/config" "github.com/prometheus/common/model" diff --git a/discovery/hetzner/hcloud_test.go b/discovery/hetzner/hcloud_test.go index e4483f4e71..b6b8300e8e 100644 --- a/discovery/hetzner/hcloud_test.go +++ b/discovery/hetzner/hcloud_test.go @@ -18,7 +18,7 @@ import ( "fmt" "testing" - "github.com/go-kit/kit/log" + "github.com/go-kit/log" "github.com/prometheus/common/model" "github.com/stretchr/testify/require" ) diff --git a/discovery/hetzner/hetzner.go b/discovery/hetzner/hetzner.go index ad11e9b307..b7c7578e2a 100644 --- a/discovery/hetzner/hetzner.go +++ b/discovery/hetzner/hetzner.go @@ -17,7 +17,7 @@ import ( "context" "time" - "github.com/go-kit/kit/log" + "github.com/go-kit/log" "github.com/hetznercloud/hcloud-go/hcloud" "github.com/pkg/errors" "github.com/prometheus/common/config" diff --git a/discovery/hetzner/robot.go b/discovery/hetzner/robot.go index b683613454..e6f1032861 100644 --- a/discovery/hetzner/robot.go +++ b/discovery/hetzner/robot.go @@ -25,7 +25,7 @@ import ( "strings" "time" - "github.com/go-kit/kit/log" + "github.com/go-kit/log" "github.com/pkg/errors" "github.com/prometheus/common/config" "github.com/prometheus/common/model" diff --git a/discovery/hetzner/robot_test.go b/discovery/hetzner/robot_test.go index c1936a33b0..f78a0bbda1 100644 --- a/discovery/hetzner/robot_test.go +++ b/discovery/hetzner/robot_test.go @@ -18,7 +18,7 @@ import ( "fmt" "testing" - "github.com/go-kit/kit/log" + "github.com/go-kit/log" "github.com/prometheus/common/config" "github.com/prometheus/common/model" "github.com/stretchr/testify/require" diff --git a/discovery/kubernetes/endpoints.go b/discovery/kubernetes/endpoints.go index ed3bfaf50f..8fc158dd40 100644 --- a/discovery/kubernetes/endpoints.go +++ b/discovery/kubernetes/endpoints.go @@ -15,12 +15,13 @@ package kubernetes import ( "context" - "github.com/prometheus/prometheus/util/strutil" "net" "strconv" - "github.com/go-kit/kit/log" - "github.com/go-kit/kit/log/level" + "github.com/prometheus/prometheus/util/strutil" + + "github.com/go-kit/log" + "github.com/go-kit/log/level" "github.com/pkg/errors" "github.com/prometheus/common/model" apiv1 "k8s.io/api/core/v1" diff --git a/discovery/kubernetes/endpointslice.go b/discovery/kubernetes/endpointslice.go index 4bb4bd5b68..71d4e37761 100644 --- a/discovery/kubernetes/endpointslice.go +++ b/discovery/kubernetes/endpointslice.go @@ -18,8 +18,8 @@ import ( "net" "strconv" - "github.com/go-kit/kit/log" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log" + "github.com/go-kit/log/level" "github.com/pkg/errors" "github.com/prometheus/common/model" apiv1 "k8s.io/api/core/v1" diff --git a/discovery/kubernetes/ingress.go b/discovery/kubernetes/ingress.go index a6ef746e47..c649df149f 100644 --- a/discovery/kubernetes/ingress.go +++ b/discovery/kubernetes/ingress.go @@ -16,8 +16,8 @@ package kubernetes import ( "context" - "github.com/go-kit/kit/log" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log" + "github.com/go-kit/log/level" "github.com/pkg/errors" "github.com/prometheus/common/model" "k8s.io/api/networking/v1beta1" diff --git a/discovery/kubernetes/kubernetes.go b/discovery/kubernetes/kubernetes.go index 602c9c0c9b..bda9e29623 100644 --- a/discovery/kubernetes/kubernetes.go +++ b/discovery/kubernetes/kubernetes.go @@ -21,8 +21,8 @@ import ( "sync" "time" - "github.com/go-kit/kit/log" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log" + "github.com/go-kit/log/level" "github.com/pkg/errors" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/common/config" diff --git a/discovery/kubernetes/kubernetes_test.go b/discovery/kubernetes/kubernetes_test.go index 087c52fa99..44a6c1b29d 100644 --- a/discovery/kubernetes/kubernetes_test.go +++ b/discovery/kubernetes/kubernetes_test.go @@ -19,7 +19,7 @@ import ( "testing" "time" - "github.com/go-kit/kit/log" + "github.com/go-kit/log" "github.com/stretchr/testify/require" "k8s.io/apimachinery/pkg/runtime" "k8s.io/client-go/kubernetes" diff --git a/discovery/kubernetes/node.go b/discovery/kubernetes/node.go index d196358df5..668686fbab 100644 --- a/discovery/kubernetes/node.go +++ b/discovery/kubernetes/node.go @@ -18,8 +18,8 @@ import ( "net" "strconv" - "github.com/go-kit/kit/log" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log" + "github.com/go-kit/log/level" "github.com/pkg/errors" "github.com/prometheus/common/model" apiv1 "k8s.io/api/core/v1" diff --git a/discovery/kubernetes/pod.go b/discovery/kubernetes/pod.go index 751bc515a7..b5c94862a7 100644 --- a/discovery/kubernetes/pod.go +++ b/discovery/kubernetes/pod.go @@ -19,8 +19,8 @@ import ( "strconv" "strings" - "github.com/go-kit/kit/log" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log" + "github.com/go-kit/log/level" "github.com/pkg/errors" "github.com/prometheus/common/model" apiv1 "k8s.io/api/core/v1" diff --git a/discovery/kubernetes/service.go b/discovery/kubernetes/service.go index 1b19c07b60..1075345404 100644 --- a/discovery/kubernetes/service.go +++ b/discovery/kubernetes/service.go @@ -18,8 +18,8 @@ import ( "net" "strconv" - "github.com/go-kit/kit/log" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log" + "github.com/go-kit/log/level" "github.com/pkg/errors" "github.com/prometheus/common/model" apiv1 "k8s.io/api/core/v1" diff --git a/discovery/linode/linode.go b/discovery/linode/linode.go index 64802c4d01..9c22eb6843 100644 --- a/discovery/linode/linode.go +++ b/discovery/linode/linode.go @@ -22,7 +22,7 @@ import ( "strings" "time" - "github.com/go-kit/kit/log" + "github.com/go-kit/log" "github.com/linode/linodego" "github.com/prometheus/common/config" "github.com/prometheus/common/model" diff --git a/discovery/linode/linode_test.go b/discovery/linode/linode_test.go index e5c89062d1..d222afffdb 100644 --- a/discovery/linode/linode_test.go +++ b/discovery/linode/linode_test.go @@ -19,7 +19,7 @@ import ( "net/url" "testing" - "github.com/go-kit/kit/log" + "github.com/go-kit/log" "github.com/prometheus/common/config" "github.com/prometheus/common/model" "github.com/stretchr/testify/require" diff --git a/discovery/manager.go b/discovery/manager.go index a4208532ee..b3dae5c59f 100644 --- a/discovery/manager.go +++ b/discovery/manager.go @@ -20,8 +20,8 @@ import ( "sync" "time" - "github.com/go-kit/kit/log" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log" + "github.com/go-kit/log/level" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/prometheus/discovery/targetgroup" diff --git a/discovery/manager_test.go b/discovery/manager_test.go index 00a35cf2d8..0a438306e4 100644 --- a/discovery/manager_test.go +++ b/discovery/manager_test.go @@ -21,7 +21,7 @@ import ( "testing" "time" - "github.com/go-kit/kit/log" + "github.com/go-kit/log" client_testutil "github.com/prometheus/client_golang/prometheus/testutil" "github.com/prometheus/common/model" "github.com/stretchr/testify/require" diff --git a/discovery/marathon/marathon.go b/discovery/marathon/marathon.go index 2ecb5c611f..ff9c769615 100644 --- a/discovery/marathon/marathon.go +++ b/discovery/marathon/marathon.go @@ -26,7 +26,7 @@ import ( "strings" "time" - "github.com/go-kit/kit/log" + "github.com/go-kit/log" "github.com/pkg/errors" "github.com/prometheus/common/config" "github.com/prometheus/common/model" diff --git a/discovery/moby/docker.go b/discovery/moby/docker.go index d82191e79c..34eea7d4c9 100644 --- a/discovery/moby/docker.go +++ b/discovery/moby/docker.go @@ -25,7 +25,7 @@ import ( "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/filters" "github.com/docker/docker/client" - "github.com/go-kit/kit/log" + "github.com/go-kit/log" "github.com/prometheus/common/config" "github.com/prometheus/common/model" "github.com/prometheus/prometheus/discovery" diff --git a/discovery/moby/docker_test.go b/discovery/moby/docker_test.go index 5cc96f3fea..9ede9ab539 100644 --- a/discovery/moby/docker_test.go +++ b/discovery/moby/docker_test.go @@ -18,7 +18,7 @@ import ( "fmt" "testing" - "github.com/go-kit/kit/log" + "github.com/go-kit/log" "github.com/prometheus/common/model" "github.com/stretchr/testify/require" "gopkg.in/yaml.v2" diff --git a/discovery/moby/dockerswarm.go b/discovery/moby/dockerswarm.go index edf3c23887..a9eabfd720 100644 --- a/discovery/moby/dockerswarm.go +++ b/discovery/moby/dockerswarm.go @@ -22,7 +22,7 @@ import ( "github.com/docker/docker/api/types/filters" "github.com/docker/docker/client" - "github.com/go-kit/kit/log" + "github.com/go-kit/log" "github.com/prometheus/common/config" "github.com/prometheus/common/model" "github.com/prometheus/common/version" diff --git a/discovery/moby/nodes_test.go b/discovery/moby/nodes_test.go index 374c8462c1..1a53321378 100644 --- a/discovery/moby/nodes_test.go +++ b/discovery/moby/nodes_test.go @@ -18,7 +18,7 @@ import ( "fmt" "testing" - "github.com/go-kit/kit/log" + "github.com/go-kit/log" "github.com/prometheus/common/model" "github.com/stretchr/testify/require" "gopkg.in/yaml.v2" diff --git a/discovery/moby/services_test.go b/discovery/moby/services_test.go index 01b35e01e4..1bc9832c7a 100644 --- a/discovery/moby/services_test.go +++ b/discovery/moby/services_test.go @@ -18,7 +18,7 @@ import ( "fmt" "testing" - "github.com/go-kit/kit/log" + "github.com/go-kit/log" "github.com/prometheus/common/model" "github.com/stretchr/testify/require" "gopkg.in/yaml.v2" diff --git a/discovery/moby/tasks_test.go b/discovery/moby/tasks_test.go index f2c2a5c349..188b473f6a 100644 --- a/discovery/moby/tasks_test.go +++ b/discovery/moby/tasks_test.go @@ -18,7 +18,7 @@ import ( "fmt" "testing" - "github.com/go-kit/kit/log" + "github.com/go-kit/log" "github.com/prometheus/common/model" "github.com/stretchr/testify/require" "gopkg.in/yaml.v2" diff --git a/discovery/openstack/hypervisor.go b/discovery/openstack/hypervisor.go index 81d0e10c99..f02fe17e7e 100644 --- a/discovery/openstack/hypervisor.go +++ b/discovery/openstack/hypervisor.go @@ -18,7 +18,7 @@ import ( "fmt" "net" - "github.com/go-kit/kit/log" + "github.com/go-kit/log" "github.com/gophercloud/gophercloud" "github.com/gophercloud/gophercloud/openstack" "github.com/gophercloud/gophercloud/openstack/compute/v2/extensions/hypervisors" diff --git a/discovery/openstack/instance.go b/discovery/openstack/instance.go index a53d6274ef..ab2221f4f9 100644 --- a/discovery/openstack/instance.go +++ b/discovery/openstack/instance.go @@ -18,8 +18,8 @@ import ( "fmt" "net" - "github.com/go-kit/kit/log" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log" + "github.com/go-kit/log/level" "github.com/gophercloud/gophercloud" "github.com/gophercloud/gophercloud/openstack" "github.com/gophercloud/gophercloud/openstack/compute/v2/extensions/floatingips" diff --git a/discovery/openstack/openstack.go b/discovery/openstack/openstack.go index c0e49f61ea..2a341976ed 100644 --- a/discovery/openstack/openstack.go +++ b/discovery/openstack/openstack.go @@ -19,7 +19,7 @@ import ( "net/http" "time" - "github.com/go-kit/kit/log" + "github.com/go-kit/log" "github.com/gophercloud/gophercloud" "github.com/gophercloud/gophercloud/openstack" conntrack "github.com/mwitkow/go-conntrack" diff --git a/discovery/refresh/refresh.go b/discovery/refresh/refresh.go index c48524c508..1b42a70c58 100644 --- a/discovery/refresh/refresh.go +++ b/discovery/refresh/refresh.go @@ -17,8 +17,8 @@ import ( "context" "time" - "github.com/go-kit/kit/log" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log" + "github.com/go-kit/log/level" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/prometheus/discovery/targetgroup" diff --git a/discovery/scaleway/scaleway.go b/discovery/scaleway/scaleway.go index 67ff53015b..c8689cb947 100644 --- a/discovery/scaleway/scaleway.go +++ b/discovery/scaleway/scaleway.go @@ -20,7 +20,7 @@ import ( "strings" "time" - "github.com/go-kit/kit/log" + "github.com/go-kit/log" "github.com/pkg/errors" "github.com/prometheus/common/config" "github.com/prometheus/common/model" diff --git a/discovery/triton/triton.go b/discovery/triton/triton.go index 6cd5e0aadd..187d31ab63 100644 --- a/discovery/triton/triton.go +++ b/discovery/triton/triton.go @@ -24,7 +24,7 @@ import ( "strings" "time" - "github.com/go-kit/kit/log" + "github.com/go-kit/log" conntrack "github.com/mwitkow/go-conntrack" "github.com/pkg/errors" "github.com/prometheus/common/config" diff --git a/discovery/zookeeper/zookeeper.go b/discovery/zookeeper/zookeeper.go index 856ae35fdf..528bdf073d 100644 --- a/discovery/zookeeper/zookeeper.go +++ b/discovery/zookeeper/zookeeper.go @@ -22,7 +22,7 @@ import ( "strings" "time" - "github.com/go-kit/kit/log" + "github.com/go-kit/log" "github.com/go-zookeeper/zk" "github.com/pkg/errors" "github.com/prometheus/common/model" diff --git a/documentation/examples/custom-sd/adapter-usage/main.go b/documentation/examples/custom-sd/adapter-usage/main.go index 13a1a90eed..6a50c38ae0 100644 --- a/documentation/examples/custom-sd/adapter-usage/main.go +++ b/documentation/examples/custom-sd/adapter-usage/main.go @@ -26,8 +26,8 @@ import ( "strings" "time" - "github.com/go-kit/kit/log" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log" + "github.com/go-kit/log/level" "github.com/prometheus/common/model" "gopkg.in/alecthomas/kingpin.v2" diff --git a/documentation/examples/custom-sd/adapter/adapter.go b/documentation/examples/custom-sd/adapter/adapter.go index 5365d798c2..e355e7b714 100644 --- a/documentation/examples/custom-sd/adapter/adapter.go +++ b/documentation/examples/custom-sd/adapter/adapter.go @@ -24,8 +24,8 @@ import ( "reflect" "sort" - "github.com/go-kit/kit/log" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log" + "github.com/go-kit/log/level" "github.com/prometheus/common/model" "github.com/prometheus/prometheus/discovery" diff --git a/documentation/examples/remote_storage/remote_storage_adapter/graphite/client.go b/documentation/examples/remote_storage/remote_storage_adapter/graphite/client.go index 34cfb61bfb..fedea48dbc 100644 --- a/documentation/examples/remote_storage/remote_storage_adapter/graphite/client.go +++ b/documentation/examples/remote_storage/remote_storage_adapter/graphite/client.go @@ -21,8 +21,8 @@ import ( "sort" "time" - "github.com/go-kit/kit/log" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log" + "github.com/go-kit/log/level" "github.com/prometheus/common/model" ) diff --git a/documentation/examples/remote_storage/remote_storage_adapter/influxdb/client.go b/documentation/examples/remote_storage/remote_storage_adapter/influxdb/client.go index 327b2ac75f..061c2e76dc 100644 --- a/documentation/examples/remote_storage/remote_storage_adapter/influxdb/client.go +++ b/documentation/examples/remote_storage/remote_storage_adapter/influxdb/client.go @@ -20,8 +20,8 @@ import ( "os" "strings" - "github.com/go-kit/kit/log" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log" + "github.com/go-kit/log/level" influx "github.com/influxdata/influxdb/client/v2" "github.com/pkg/errors" "github.com/prometheus/client_golang/prometheus" diff --git a/documentation/examples/remote_storage/remote_storage_adapter/main.go b/documentation/examples/remote_storage/remote_storage_adapter/main.go index de35ecf693..6a993a6098 100644 --- a/documentation/examples/remote_storage/remote_storage_adapter/main.go +++ b/documentation/examples/remote_storage/remote_storage_adapter/main.go @@ -25,8 +25,8 @@ import ( "sync" "time" - "github.com/go-kit/kit/log" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log" + "github.com/go-kit/log/level" "github.com/gogo/protobuf/proto" "github.com/golang/snappy" influx "github.com/influxdata/influxdb/client/v2" diff --git a/documentation/examples/remote_storage/remote_storage_adapter/opentsdb/client.go b/documentation/examples/remote_storage/remote_storage_adapter/opentsdb/client.go index eb69df96dd..d90ce48095 100644 --- a/documentation/examples/remote_storage/remote_storage_adapter/opentsdb/client.go +++ b/documentation/examples/remote_storage/remote_storage_adapter/opentsdb/client.go @@ -24,8 +24,8 @@ import ( "net/url" "time" - "github.com/go-kit/kit/log" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log" + "github.com/go-kit/log/level" "github.com/pkg/errors" "github.com/prometheus/common/model" ) diff --git a/notifier/notifier.go b/notifier/notifier.go index 9c79807a6b..7af21c565c 100644 --- a/notifier/notifier.go +++ b/notifier/notifier.go @@ -28,8 +28,8 @@ import ( "sync" "time" - "github.com/go-kit/kit/log" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log" + "github.com/go-kit/log/level" "github.com/go-openapi/strfmt" "github.com/pkg/errors" "github.com/prometheus/alertmanager/api/v2/models" diff --git a/pkg/logging/dedupe.go b/pkg/logging/dedupe.go index 1d911ca2f6..d490a6afdf 100644 --- a/pkg/logging/dedupe.go +++ b/pkg/logging/dedupe.go @@ -18,7 +18,7 @@ import ( "sync" "time" - "github.com/go-kit/kit/log" + "github.com/go-kit/log" "github.com/go-logfmt/logfmt" ) diff --git a/pkg/logging/file.go b/pkg/logging/file.go index be118fad05..3c0c3e3b04 100644 --- a/pkg/logging/file.go +++ b/pkg/logging/file.go @@ -17,7 +17,7 @@ import ( "os" "time" - "github.com/go-kit/kit/log" + "github.com/go-kit/log" "github.com/pkg/errors" ) diff --git a/pkg/logging/ratelimit.go b/pkg/logging/ratelimit.go index d3567eaa0e..32d1e249e6 100644 --- a/pkg/logging/ratelimit.go +++ b/pkg/logging/ratelimit.go @@ -14,7 +14,7 @@ package logging import ( - "github.com/go-kit/kit/log" + "github.com/go-kit/log" "golang.org/x/time/rate" ) diff --git a/promql/engine.go b/promql/engine.go index f9ac94873e..46715fbb3c 100644 --- a/promql/engine.go +++ b/promql/engine.go @@ -27,8 +27,8 @@ import ( "sync" "time" - "github.com/go-kit/kit/log" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log" + "github.com/go-kit/log/level" "github.com/opentracing/opentracing-go" "github.com/pkg/errors" "github.com/prometheus/client_golang/prometheus" diff --git a/promql/engine_test.go b/promql/engine_test.go index d1afb7eb3e..e6b00c84e9 100644 --- a/promql/engine_test.go +++ b/promql/engine_test.go @@ -22,7 +22,7 @@ import ( "testing" "time" - "github.com/go-kit/kit/log" + "github.com/go-kit/log" "github.com/stretchr/testify/require" "go.uber.org/goleak" diff --git a/promql/query_logger.go b/promql/query_logger.go index 657f9db01d..cf2fbbfcc8 100644 --- a/promql/query_logger.go +++ b/promql/query_logger.go @@ -23,8 +23,8 @@ import ( "unicode/utf8" "github.com/edsrzf/mmap-go" - "github.com/go-kit/kit/log" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log" + "github.com/go-kit/log/level" ) type ActiveQueryTracker struct { diff --git a/rules/alerting.go b/rules/alerting.go index 53da7586b8..122a83c069 100644 --- a/rules/alerting.go +++ b/rules/alerting.go @@ -22,8 +22,8 @@ import ( "sync" "time" - "github.com/go-kit/kit/log" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log" + "github.com/go-kit/log/level" "github.com/pkg/errors" "github.com/prometheus/common/model" yaml "gopkg.in/yaml.v2" diff --git a/rules/alerting_test.go b/rules/alerting_test.go index f97f5718e8..1e46175519 100644 --- a/rules/alerting_test.go +++ b/rules/alerting_test.go @@ -19,7 +19,7 @@ import ( "testing" "time" - "github.com/go-kit/kit/log" + "github.com/go-kit/log" "github.com/stretchr/testify/require" "github.com/prometheus/prometheus/pkg/labels" diff --git a/rules/manager.go b/rules/manager.go index 0cbcaa74f7..837a0741fd 100644 --- a/rules/manager.go +++ b/rules/manager.go @@ -22,8 +22,8 @@ import ( "sync" "time" - "github.com/go-kit/kit/log" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log" + "github.com/go-kit/log/level" opentracing "github.com/opentracing/opentracing-go" "github.com/pkg/errors" "github.com/prometheus/client_golang/prometheus" diff --git a/rules/manager_test.go b/rules/manager_test.go index ab92eda162..8f42228df5 100644 --- a/rules/manager_test.go +++ b/rules/manager_test.go @@ -23,7 +23,7 @@ import ( "testing" "time" - "github.com/go-kit/kit/log" + "github.com/go-kit/log" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/common/model" "github.com/stretchr/testify/require" diff --git a/scrape/manager.go b/scrape/manager.go index bf73561a12..a33c7e1792 100644 --- a/scrape/manager.go +++ b/scrape/manager.go @@ -23,8 +23,8 @@ import ( "sync" "time" - "github.com/go-kit/kit/log" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log" + "github.com/go-kit/log/level" "github.com/pkg/errors" "github.com/prometheus/client_golang/prometheus" diff --git a/scrape/scrape.go b/scrape/scrape.go index 32bb5fb1cc..215c63c049 100644 --- a/scrape/scrape.go +++ b/scrape/scrape.go @@ -28,8 +28,8 @@ import ( "time" "unsafe" - "github.com/go-kit/kit/log" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log" + "github.com/go-kit/log/level" "github.com/pkg/errors" "github.com/prometheus/client_golang/prometheus" config_util "github.com/prometheus/common/config" diff --git a/scrape/scrape_test.go b/scrape/scrape_test.go index 91f6807633..5848c5cb11 100644 --- a/scrape/scrape_test.go +++ b/scrape/scrape_test.go @@ -29,7 +29,7 @@ import ( "testing" "time" - "github.com/go-kit/kit/log" + "github.com/go-kit/log" "github.com/pkg/errors" dto "github.com/prometheus/client_model/go" config_util "github.com/prometheus/common/config" diff --git a/storage/fanout.go b/storage/fanout.go index b737d63008..206105fa53 100644 --- a/storage/fanout.go +++ b/storage/fanout.go @@ -16,8 +16,8 @@ package storage import ( "context" - "github.com/go-kit/kit/log" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log" + "github.com/go-kit/log/level" "github.com/prometheus/common/model" "github.com/prometheus/prometheus/pkg/exemplar" diff --git a/storage/remote/metadata_watcher.go b/storage/remote/metadata_watcher.go index a347a3f253..1096e406ad 100644 --- a/storage/remote/metadata_watcher.go +++ b/storage/remote/metadata_watcher.go @@ -17,8 +17,8 @@ import ( "context" "time" - "github.com/go-kit/kit/log" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log" + "github.com/go-kit/log/level" "github.com/pkg/errors" "github.com/prometheus/common/model" "github.com/prometheus/prometheus/scrape" diff --git a/storage/remote/queue_manager.go b/storage/remote/queue_manager.go index 44f3df055e..b0fde112ee 100644 --- a/storage/remote/queue_manager.go +++ b/storage/remote/queue_manager.go @@ -20,8 +20,8 @@ import ( "sync" "time" - "github.com/go-kit/kit/log" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log" + "github.com/go-kit/log/level" "github.com/gogo/protobuf/proto" "github.com/golang/snappy" "github.com/opentracing/opentracing-go" diff --git a/storage/remote/queue_manager_test.go b/storage/remote/queue_manager_test.go index 1424f23c6a..5c3493d48c 100644 --- a/storage/remote/queue_manager_test.go +++ b/storage/remote/queue_manager_test.go @@ -27,7 +27,7 @@ import ( "testing" "time" - "github.com/go-kit/kit/log" + "github.com/go-kit/log" "github.com/gogo/protobuf/proto" "github.com/golang/snappy" "github.com/prometheus/client_golang/prometheus" diff --git a/storage/remote/read_handler.go b/storage/remote/read_handler.go index e5c8ea9ee3..ceea4579af 100644 --- a/storage/remote/read_handler.go +++ b/storage/remote/read_handler.go @@ -18,8 +18,8 @@ import ( "net/http" "sort" - "github.com/go-kit/kit/log" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log" + "github.com/go-kit/log/level" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/prometheus/config" diff --git a/storage/remote/storage.go b/storage/remote/storage.go index 131ab73b7f..5716605a8d 100644 --- a/storage/remote/storage.go +++ b/storage/remote/storage.go @@ -21,7 +21,7 @@ import ( "sync" "time" - "github.com/go-kit/kit/log" + "github.com/go-kit/log" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/common/model" "gopkg.in/yaml.v2" diff --git a/storage/remote/write.go b/storage/remote/write.go index 94d96295ee..2d96f70ae2 100644 --- a/storage/remote/write.go +++ b/storage/remote/write.go @@ -19,7 +19,7 @@ import ( "sync" "time" - "github.com/go-kit/kit/log" + "github.com/go-kit/log" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" diff --git a/storage/remote/write_handler.go b/storage/remote/write_handler.go index 20e2cf4512..a3dee6136a 100644 --- a/storage/remote/write_handler.go +++ b/storage/remote/write_handler.go @@ -17,8 +17,8 @@ import ( "context" "net/http" - "github.com/go-kit/kit/log" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log" + "github.com/go-kit/log/level" "github.com/prometheus/prometheus/prompb" "github.com/prometheus/prometheus/storage" ) diff --git a/storage/remote/write_handler_test.go b/storage/remote/write_handler_test.go index 49f9643141..5e086fe2fa 100644 --- a/storage/remote/write_handler_test.go +++ b/storage/remote/write_handler_test.go @@ -22,7 +22,7 @@ import ( "net/http/httptest" "testing" - "github.com/go-kit/kit/log" + "github.com/go-kit/log" "github.com/prometheus/prometheus/pkg/exemplar" "github.com/prometheus/prometheus/pkg/labels" "github.com/prometheus/prometheus/prompb" diff --git a/tsdb/block.go b/tsdb/block.go index 47c842319f..23a075c4f6 100644 --- a/tsdb/block.go +++ b/tsdb/block.go @@ -23,8 +23,8 @@ import ( "sort" "sync" - "github.com/go-kit/kit/log" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log" + "github.com/go-kit/log/level" "github.com/oklog/ulid" "github.com/pkg/errors" diff --git a/tsdb/block_test.go b/tsdb/block_test.go index 714d47a9f6..fc53d02dcc 100644 --- a/tsdb/block_test.go +++ b/tsdb/block_test.go @@ -27,7 +27,7 @@ import ( "strconv" "testing" - "github.com/go-kit/kit/log" + "github.com/go-kit/log" "github.com/stretchr/testify/require" "github.com/prometheus/prometheus/pkg/labels" diff --git a/tsdb/blockwriter.go b/tsdb/blockwriter.go index 53b16bbecc..a5a5d74743 100644 --- a/tsdb/blockwriter.go +++ b/tsdb/blockwriter.go @@ -19,8 +19,8 @@ import ( "math" "os" - "github.com/go-kit/kit/log" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log" + "github.com/go-kit/log/level" "github.com/oklog/ulid" "github.com/pkg/errors" diff --git a/tsdb/blockwriter_test.go b/tsdb/blockwriter_test.go index 9145a31282..07b500d7ae 100644 --- a/tsdb/blockwriter_test.go +++ b/tsdb/blockwriter_test.go @@ -21,7 +21,7 @@ import ( "path/filepath" "testing" - "github.com/go-kit/kit/log" + "github.com/go-kit/log" "github.com/stretchr/testify/require" "github.com/prometheus/prometheus/pkg/labels" diff --git a/tsdb/compact.go b/tsdb/compact.go index ca7baa1910..b2ae7e4ea5 100644 --- a/tsdb/compact.go +++ b/tsdb/compact.go @@ -24,8 +24,8 @@ import ( "sort" "time" - "github.com/go-kit/kit/log" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log" + "github.com/go-kit/log/level" "github.com/oklog/ulid" "github.com/pkg/errors" "github.com/prometheus/client_golang/prometheus" diff --git a/tsdb/compact_test.go b/tsdb/compact_test.go index c00ea1144d..e30f2b190f 100644 --- a/tsdb/compact_test.go +++ b/tsdb/compact_test.go @@ -24,7 +24,7 @@ import ( "testing" "time" - "github.com/go-kit/kit/log" + "github.com/go-kit/log" "github.com/pkg/errors" prom_testutil "github.com/prometheus/client_golang/prometheus/testutil" "github.com/stretchr/testify/require" diff --git a/tsdb/db.go b/tsdb/db.go index 62cd302bce..1114be8243 100644 --- a/tsdb/db.go +++ b/tsdb/db.go @@ -28,8 +28,8 @@ import ( "sync" "time" - "github.com/go-kit/kit/log" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log" + "github.com/go-kit/log/level" "github.com/oklog/ulid" "github.com/pkg/errors" "github.com/prometheus/client_golang/prometheus" diff --git a/tsdb/db_test.go b/tsdb/db_test.go index 89b83c6b20..8548f68482 100644 --- a/tsdb/db_test.go +++ b/tsdb/db_test.go @@ -32,7 +32,7 @@ import ( "testing" "time" - "github.com/go-kit/kit/log" + "github.com/go-kit/log" "github.com/oklog/ulid" "github.com/pkg/errors" "github.com/prometheus/client_golang/prometheus" diff --git a/tsdb/head.go b/tsdb/head.go index b90616550f..1fce0368fc 100644 --- a/tsdb/head.go +++ b/tsdb/head.go @@ -23,8 +23,8 @@ import ( "sync" "time" - "github.com/go-kit/kit/log" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log" + "github.com/go-kit/log/level" "github.com/oklog/ulid" "github.com/pkg/errors" "github.com/prometheus/client_golang/prometheus" diff --git a/tsdb/repair.go b/tsdb/repair.go index cc777546e5..8d60cb3817 100644 --- a/tsdb/repair.go +++ b/tsdb/repair.go @@ -20,8 +20,8 @@ import ( "os" "path/filepath" - "github.com/go-kit/kit/log" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log" + "github.com/go-kit/log/level" "github.com/pkg/errors" tsdb_errors "github.com/prometheus/prometheus/tsdb/errors" diff --git a/tsdb/tombstones/tombstones.go b/tsdb/tombstones/tombstones.go index aa74a7d1e3..32431886b5 100644 --- a/tsdb/tombstones/tombstones.go +++ b/tsdb/tombstones/tombstones.go @@ -24,8 +24,8 @@ import ( "sort" "sync" - "github.com/go-kit/kit/log" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log" + "github.com/go-kit/log/level" "github.com/pkg/errors" "github.com/prometheus/prometheus/tsdb/encoding" diff --git a/tsdb/tombstones/tombstones_test.go b/tsdb/tombstones/tombstones_test.go index 057a505f6e..d34f303ad1 100644 --- a/tsdb/tombstones/tombstones_test.go +++ b/tsdb/tombstones/tombstones_test.go @@ -22,7 +22,7 @@ import ( "testing" "time" - "github.com/go-kit/kit/log" + "github.com/go-kit/log" "github.com/stretchr/testify/require" "go.uber.org/goleak" ) diff --git a/tsdb/tsdbblockutil.go b/tsdb/tsdbblockutil.go index 8cc0dd1952..3e4ac5856f 100644 --- a/tsdb/tsdbblockutil.go +++ b/tsdb/tsdbblockutil.go @@ -18,7 +18,7 @@ import ( "fmt" "path/filepath" - "github.com/go-kit/kit/log" + "github.com/go-kit/log" "github.com/prometheus/prometheus/storage" ) diff --git a/tsdb/wal.go b/tsdb/wal.go index 54b08f80c5..71fc0a44c3 100644 --- a/tsdb/wal.go +++ b/tsdb/wal.go @@ -27,8 +27,8 @@ import ( "sync" "time" - "github.com/go-kit/kit/log" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log" + "github.com/go-kit/log/level" "github.com/pkg/errors" "github.com/prometheus/client_golang/prometheus" diff --git a/tsdb/wal/checkpoint.go b/tsdb/wal/checkpoint.go index 1f76816709..eb0d27034a 100644 --- a/tsdb/wal/checkpoint.go +++ b/tsdb/wal/checkpoint.go @@ -25,8 +25,8 @@ import ( "strconv" "strings" - "github.com/go-kit/kit/log" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log" + "github.com/go-kit/log/level" "github.com/pkg/errors" tsdb_errors "github.com/prometheus/prometheus/tsdb/errors" diff --git a/tsdb/wal/checkpoint_test.go b/tsdb/wal/checkpoint_test.go index c843aa12cb..f84fb4dd89 100644 --- a/tsdb/wal/checkpoint_test.go +++ b/tsdb/wal/checkpoint_test.go @@ -22,7 +22,7 @@ import ( "strings" "testing" - "github.com/go-kit/kit/log" + "github.com/go-kit/log" "github.com/pkg/errors" "github.com/stretchr/testify/require" diff --git a/tsdb/wal/live_reader.go b/tsdb/wal/live_reader.go index 9155e4d03f..f09d149aa3 100644 --- a/tsdb/wal/live_reader.go +++ b/tsdb/wal/live_reader.go @@ -20,8 +20,8 @@ import ( "hash/crc32" "io" - "github.com/go-kit/kit/log" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log" + "github.com/go-kit/log/level" "github.com/golang/snappy" "github.com/pkg/errors" "github.com/prometheus/client_golang/prometheus" diff --git a/tsdb/wal/reader_test.go b/tsdb/wal/reader_test.go index 66932e7481..8d53612c0c 100644 --- a/tsdb/wal/reader_test.go +++ b/tsdb/wal/reader_test.go @@ -29,7 +29,7 @@ import ( "testing" "time" - "github.com/go-kit/kit/log" + "github.com/go-kit/log" "github.com/stretchr/testify/require" tsdb_errors "github.com/prometheus/prometheus/tsdb/errors" diff --git a/tsdb/wal/wal.go b/tsdb/wal/wal.go index ba82251a3f..a119941576 100644 --- a/tsdb/wal/wal.go +++ b/tsdb/wal/wal.go @@ -28,8 +28,8 @@ import ( "sync" "time" - "github.com/go-kit/kit/log" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log" + "github.com/go-kit/log/level" "github.com/golang/snappy" "github.com/pkg/errors" "github.com/prometheus/client_golang/prometheus" diff --git a/tsdb/wal/watcher.go b/tsdb/wal/watcher.go index f470641aee..fda5ad1e62 100644 --- a/tsdb/wal/watcher.go +++ b/tsdb/wal/watcher.go @@ -25,8 +25,8 @@ import ( "strings" "time" - "github.com/go-kit/kit/log" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log" + "github.com/go-kit/log/level" "github.com/pkg/errors" "github.com/prometheus/client_golang/prometheus" diff --git a/tsdb/wal/watcher_test.go b/tsdb/wal/watcher_test.go index 03234c5dbe..dcde251a28 100644 --- a/tsdb/wal/watcher_test.go +++ b/tsdb/wal/watcher_test.go @@ -22,7 +22,7 @@ import ( "testing" "time" - "github.com/go-kit/kit/log" + "github.com/go-kit/log" "github.com/prometheus/client_golang/prometheus" "github.com/stretchr/testify/require" diff --git a/tsdb/wal_test.go b/tsdb/wal_test.go index f20f5dd415..9667105e1e 100644 --- a/tsdb/wal_test.go +++ b/tsdb/wal_test.go @@ -26,7 +26,7 @@ import ( "testing" "time" - "github.com/go-kit/kit/log" + "github.com/go-kit/log" "github.com/stretchr/testify/require" "github.com/prometheus/prometheus/pkg/labels" diff --git a/util/testutil/logging.go b/util/testutil/logging.go index 839b86690b..db096ea234 100644 --- a/util/testutil/logging.go +++ b/util/testutil/logging.go @@ -16,7 +16,7 @@ package testutil import ( "testing" - "github.com/go-kit/kit/log" + "github.com/go-kit/log" ) type logger struct { diff --git a/util/treecache/treecache.go b/util/treecache/treecache.go index ec48f9e9cb..443977d775 100644 --- a/util/treecache/treecache.go +++ b/util/treecache/treecache.go @@ -20,8 +20,8 @@ import ( "sync" "time" - "github.com/go-kit/kit/log" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log" + "github.com/go-kit/log/level" "github.com/go-zookeeper/zk" "github.com/pkg/errors" "github.com/prometheus/client_golang/prometheus" diff --git a/web/api/v1/api.go b/web/api/v1/api.go index 1415092a65..8cbc915b50 100644 --- a/web/api/v1/api.go +++ b/web/api/v1/api.go @@ -30,8 +30,8 @@ import ( "time" "unsafe" - "github.com/go-kit/kit/log" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log" + "github.com/go-kit/log/level" jsoniter "github.com/json-iterator/go" "github.com/pkg/errors" "github.com/prometheus/client_golang/prometheus" diff --git a/web/api/v1/api_test.go b/web/api/v1/api_test.go index 5fd740b061..4495832a56 100644 --- a/web/api/v1/api_test.go +++ b/web/api/v1/api_test.go @@ -30,7 +30,7 @@ import ( "testing" "time" - "github.com/go-kit/kit/log" + "github.com/go-kit/log" "github.com/pkg/errors" "github.com/prometheus/client_golang/prometheus" config_util "github.com/prometheus/common/config" diff --git a/web/federate.go b/web/federate.go index c825a08ba0..7319b34e84 100644 --- a/web/federate.go +++ b/web/federate.go @@ -18,7 +18,7 @@ import ( "net/http" "sort" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log/level" "github.com/gogo/protobuf/proto" "github.com/pkg/errors" "github.com/prometheus/client_golang/prometheus" diff --git a/web/web.go b/web/web.go index 0ba558a37e..b6d4dffae6 100644 --- a/web/web.go +++ b/web/web.go @@ -38,8 +38,8 @@ import ( "time" "github.com/alecthomas/units" - "github.com/go-kit/kit/log" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log" + "github.com/go-kit/log/level" conntrack "github.com/mwitkow/go-conntrack" "github.com/opentracing-contrib/go-stdlib/nethttp" opentracing "github.com/opentracing/opentracing-go"