diff --git a/api/handler.go b/api/handler.go index 4bbfc2b8..8f61c212 100644 --- a/api/handler.go +++ b/api/handler.go @@ -29,7 +29,7 @@ import ( "github.com/golang/glog" "github.com/google/cadvisor/events" - "github.com/google/cadvisor/info" + info "github.com/google/cadvisor/info/v1" "github.com/google/cadvisor/manager" ) diff --git a/api/versions.go b/api/versions.go index 7ecd4499..4b2d14a9 100644 --- a/api/versions.go +++ b/api/versions.go @@ -20,7 +20,7 @@ import ( "github.com/golang/glog" "github.com/google/cadvisor/events" - "github.com/google/cadvisor/info" + info "github.com/google/cadvisor/info/v1" "github.com/google/cadvisor/manager" ) diff --git a/cadvisor.go b/cadvisor.go index a5f2e80f..5c4755ec 100644 --- a/cadvisor.go +++ b/cadvisor.go @@ -28,12 +28,12 @@ import ( "github.com/golang/glog" "github.com/google/cadvisor/api" "github.com/google/cadvisor/healthz" - "github.com/google/cadvisor/info" "github.com/google/cadvisor/manager" "github.com/google/cadvisor/pages" "github.com/google/cadvisor/pages/static" "github.com/google/cadvisor/utils/sysfs" "github.com/google/cadvisor/validate" + "github.com/google/cadvisor/version" ) var argIp = flag.String("listen_ip", "", "IP to listen on, defaults to all IPs") @@ -53,7 +53,7 @@ func main() { flag.Parse() if *versionFlag { - fmt.Printf("cAdvisor version %s\n", info.VERSION) + fmt.Printf("cAdvisor version %s\n", version.VERSION) os.Exit(0) } @@ -135,7 +135,7 @@ func main() { // Install signal handler. installSignalHandler(containerManager) - glog.Infof("Starting cAdvisor version: %q on port %d", info.VERSION, *argPort) + glog.Infof("Starting cAdvisor version: %q on port %d", version.VERSION, *argPort) addr := fmt.Sprintf("%s:%d", *argIp, *argPort) glog.Fatal(http.ListenAndServe(addr, nil)) diff --git a/client/client.go b/client/client.go index eba99aac..9a211185 100644 --- a/client/client.go +++ b/client/client.go @@ -24,7 +24,7 @@ import ( "path" "strings" - "github.com/google/cadvisor/info" + info "github.com/google/cadvisor/info/v1" ) // Client represents the base URL for a cAdvisor client. diff --git a/client/client_test.go b/client/client_test.go index 6ed088fb..c309650a 100644 --- a/client/client_test.go +++ b/client/client_test.go @@ -25,8 +25,8 @@ import ( "testing" "time" - "github.com/google/cadvisor/info" - itest "github.com/google/cadvisor/info/test" + info "github.com/google/cadvisor/info/v1" + itest "github.com/google/cadvisor/info/v1/test" "github.com/kr/pretty" ) diff --git a/container/container.go b/container/container.go index 492430ff..b62e3e96 100644 --- a/container/container.go +++ b/container/container.go @@ -16,7 +16,7 @@ // defines an interface for container operation handlers. package container -import "github.com/google/cadvisor/info" +import info "github.com/google/cadvisor/info/v1" // ListType describes whether listing should be just for a // specific container or performed recursively. diff --git a/container/docker/factory.go b/container/docker/factory.go index 1be9f342..d7454e60 100644 --- a/container/docker/factory.go +++ b/container/docker/factory.go @@ -28,7 +28,7 @@ import ( "github.com/golang/glog" "github.com/google/cadvisor/container" "github.com/google/cadvisor/container/libcontainer" - "github.com/google/cadvisor/info" + info "github.com/google/cadvisor/info/v1" "github.com/google/cadvisor/utils" ) diff --git a/container/docker/handler.go b/container/docker/handler.go index a5c49e91..a05dfe27 100644 --- a/container/docker/handler.go +++ b/container/docker/handler.go @@ -32,7 +32,7 @@ import ( "github.com/google/cadvisor/container" containerLibcontainer "github.com/google/cadvisor/container/libcontainer" "github.com/google/cadvisor/fs" - "github.com/google/cadvisor/info" + info "github.com/google/cadvisor/info/v1" "github.com/google/cadvisor/utils" ) diff --git a/container/libcontainer/helpers.go b/container/libcontainer/helpers.go index 43bf184f..e33030c7 100644 --- a/container/libcontainer/helpers.go +++ b/container/libcontainer/helpers.go @@ -22,7 +22,7 @@ import ( "github.com/docker/libcontainer/cgroups" cgroupfs "github.com/docker/libcontainer/cgroups/fs" "github.com/docker/libcontainer/network" - "github.com/google/cadvisor/info" + info "github.com/google/cadvisor/info/v1" ) type CgroupSubsystems struct { diff --git a/container/mock.go b/container/mock.go index 24816d00..1d549885 100644 --- a/container/mock.go +++ b/container/mock.go @@ -15,7 +15,7 @@ package container import ( - "github.com/google/cadvisor/info" + info "github.com/google/cadvisor/info/v1" "github.com/stretchr/testify/mock" ) diff --git a/container/raw/factory.go b/container/raw/factory.go index f8d072b1..4cd918f3 100644 --- a/container/raw/factory.go +++ b/container/raw/factory.go @@ -20,7 +20,7 @@ import ( "github.com/golang/glog" "github.com/google/cadvisor/container" "github.com/google/cadvisor/container/libcontainer" - "github.com/google/cadvisor/info" + info "github.com/google/cadvisor/info/v1" ) type rawFactory struct { diff --git a/container/raw/handler.go b/container/raw/handler.go index 155dc95b..d5781e76 100644 --- a/container/raw/handler.go +++ b/container/raw/handler.go @@ -33,7 +33,7 @@ import ( "github.com/google/cadvisor/container" "github.com/google/cadvisor/container/libcontainer" "github.com/google/cadvisor/fs" - "github.com/google/cadvisor/info" + info "github.com/google/cadvisor/info/v1" "github.com/google/cadvisor/utils" "github.com/google/cadvisor/utils/sysinfo" ) diff --git a/info/container.go b/info/v1/container.go similarity index 99% rename from info/container.go rename to info/v1/container.go index 989fd6c0..91a614e0 100644 --- a/info/container.go +++ b/info/v1/container.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package info +package v1 import ( "reflect" diff --git a/info/container_test.go b/info/v1/container_test.go similarity index 99% rename from info/container_test.go rename to info/v1/container_test.go index 2ff38e69..58dc79e3 100644 --- a/info/container_test.go +++ b/info/v1/container_test.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package info +package v1 import ( "testing" diff --git a/info/machine.go b/info/v1/machine.go similarity index 99% rename from info/machine.go rename to info/v1/machine.go index e4e0af95..d880372c 100644 --- a/info/machine.go +++ b/info/v1/machine.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package info +package v1 type FsInfo struct { // Block device associated with the filesystem. diff --git a/info/test/datagen.go b/info/v1/test/datagen.go similarity index 98% rename from info/test/datagen.go rename to info/v1/test/datagen.go index abc1f3c3..24431692 100644 --- a/info/test/datagen.go +++ b/info/v1/test/datagen.go @@ -19,7 +19,7 @@ import ( "math/rand" "time" - "github.com/google/cadvisor/info" + info "github.com/google/cadvisor/info/v1" ) func GenerateRandomStats(numStats, numCores int, duration time.Duration) []*info.ContainerStats { diff --git a/integration/tests/api/docker_test.go b/integration/tests/api/docker_test.go index 4cd80556..1629c14d 100644 --- a/integration/tests/api/docker_test.go +++ b/integration/tests/api/docker_test.go @@ -21,7 +21,7 @@ import ( "testing" "time" - "github.com/google/cadvisor/info" + info "github.com/google/cadvisor/info/v1" "github.com/google/cadvisor/integration/framework" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/integration/tests/api/test_utils.go b/integration/tests/api/test_utils.go index 90519073..be661cf6 100644 --- a/integration/tests/api/test_utils.go +++ b/integration/tests/api/test_utils.go @@ -18,7 +18,7 @@ import ( "testing" "time" - "github.com/google/cadvisor/info" + info "github.com/google/cadvisor/info/v1" "github.com/stretchr/testify/assert" ) diff --git a/manager/container.go b/manager/container.go index 4e9ef03f..f78ba9ed 100644 --- a/manager/container.go +++ b/manager/container.go @@ -25,7 +25,7 @@ import ( "github.com/docker/docker/pkg/units" "github.com/golang/glog" "github.com/google/cadvisor/container" - "github.com/google/cadvisor/info" + info "github.com/google/cadvisor/info/v1" "github.com/google/cadvisor/storage/memory" "github.com/google/cadvisor/summary" "github.com/google/cadvisor/utils/cpuload" diff --git a/manager/container_test.go b/manager/container_test.go index 57a0cad7..bd73a119 100644 --- a/manager/container_test.go +++ b/manager/container_test.go @@ -23,8 +23,8 @@ import ( "time" "github.com/google/cadvisor/container" - "github.com/google/cadvisor/info" - itest "github.com/google/cadvisor/info/test" + info "github.com/google/cadvisor/info/v1" + itest "github.com/google/cadvisor/info/v1/test" "github.com/google/cadvisor/storage/memory" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/manager/machine.go b/manager/machine.go index 938f967d..bbb36c99 100644 --- a/manager/machine.go +++ b/manager/machine.go @@ -26,10 +26,11 @@ import ( dclient "github.com/fsouza/go-dockerclient" "github.com/google/cadvisor/container/docker" "github.com/google/cadvisor/fs" - "github.com/google/cadvisor/info" + info "github.com/google/cadvisor/info/v1" "github.com/google/cadvisor/utils" "github.com/google/cadvisor/utils/sysfs" "github.com/google/cadvisor/utils/sysinfo" + version "github.com/google/cadvisor/version" ) var cpuRegExp = regexp.MustCompile("processor\\t*: +([0-9]+)") @@ -272,7 +273,7 @@ func getVersionInfo() (*info.VersionInfo, error) { KernelVersion: kernel_version, ContainerOsVersion: container_os, DockerVersion: docker_version, - CadvisorVersion: info.VERSION, + CadvisorVersion: version.VERSION, }, nil } diff --git a/manager/manager.go b/manager/manager.go index 9fb866a4..3535a22a 100644 --- a/manager/manager.go +++ b/manager/manager.go @@ -30,7 +30,7 @@ import ( "github.com/google/cadvisor/container/docker" "github.com/google/cadvisor/container/raw" "github.com/google/cadvisor/events" - "github.com/google/cadvisor/info" + info "github.com/google/cadvisor/info/v1" "github.com/google/cadvisor/storage/memory" "github.com/google/cadvisor/utils/cpuload" "github.com/google/cadvisor/utils/oomparser" diff --git a/manager/manager_mock.go b/manager/manager_mock.go index 5c6c1a38..efe6c6c6 100644 --- a/manager/manager_mock.go +++ b/manager/manager_mock.go @@ -16,7 +16,7 @@ package manager import ( "github.com/google/cadvisor/events" - "github.com/google/cadvisor/info" + info "github.com/google/cadvisor/info/v1" "github.com/stretchr/testify/mock" ) diff --git a/manager/manager_test.go b/manager/manager_test.go index 9613d7be..d24ae611 100644 --- a/manager/manager_test.go +++ b/manager/manager_test.go @@ -24,8 +24,8 @@ import ( "github.com/google/cadvisor/container" "github.com/google/cadvisor/container/docker" - "github.com/google/cadvisor/info" - itest "github.com/google/cadvisor/info/test" + info "github.com/google/cadvisor/info/v1" + itest "github.com/google/cadvisor/info/v1/test" "github.com/google/cadvisor/storage/memory" "github.com/google/cadvisor/utils/sysfs/fakesysfs" ) diff --git a/manager/topology_test.go b/manager/topology_test.go index 24582941..dbae6df3 100644 --- a/manager/topology_test.go +++ b/manager/topology_test.go @@ -19,7 +19,7 @@ import ( "reflect" "testing" - "github.com/google/cadvisor/info" + info "github.com/google/cadvisor/info/v1" "github.com/google/cadvisor/utils/sysfs" "github.com/google/cadvisor/utils/sysfs/fakesysfs" ) diff --git a/pages/containers.go b/pages/containers.go index 574b415f..6f7efaaa 100644 --- a/pages/containers.go +++ b/pages/containers.go @@ -27,7 +27,7 @@ import ( "time" "github.com/golang/glog" - "github.com/google/cadvisor/info" + info "github.com/google/cadvisor/info/v1" "github.com/google/cadvisor/manager" ) diff --git a/pages/docker.go b/pages/docker.go index f14fd6f2..3fc23ecd 100644 --- a/pages/docker.go +++ b/pages/docker.go @@ -23,7 +23,7 @@ import ( "github.com/golang/glog" "github.com/google/cadvisor/container/docker" - "github.com/google/cadvisor/info" + info "github.com/google/cadvisor/info/v1" "github.com/google/cadvisor/manager" ) diff --git a/pages/pages.go b/pages/pages.go index 97986a0e..db0043cc 100644 --- a/pages/pages.go +++ b/pages/pages.go @@ -22,7 +22,7 @@ import ( auth "github.com/abbot/go-http-auth" "github.com/golang/glog" - "github.com/google/cadvisor/info" + info "github.com/google/cadvisor/info/v1" "github.com/google/cadvisor/manager" ) diff --git a/storage/bigquery/bigquery.go b/storage/bigquery/bigquery.go index 4f8eb032..fe4edf74 100644 --- a/storage/bigquery/bigquery.go +++ b/storage/bigquery/bigquery.go @@ -20,7 +20,7 @@ import ( "time" bigquery "code.google.com/p/google-api-go-client/bigquery/v2" - "github.com/google/cadvisor/info" + info "github.com/google/cadvisor/info/v1" "github.com/google/cadvisor/storage" "github.com/google/cadvisor/storage/bigquery/client" ) diff --git a/storage/influxdb/influxdb.go b/storage/influxdb/influxdb.go index 8dc90758..00aafcd8 100644 --- a/storage/influxdb/influxdb.go +++ b/storage/influxdb/influxdb.go @@ -19,7 +19,7 @@ import ( "sync" "time" - "github.com/google/cadvisor/info" + info "github.com/google/cadvisor/info/v1" influxdb "github.com/influxdb/influxdb/client" ) diff --git a/storage/influxdb/influxdb_test.go b/storage/influxdb/influxdb_test.go index a50208ff..63a7dd4b 100644 --- a/storage/influxdb/influxdb_test.go +++ b/storage/influxdb/influxdb_test.go @@ -23,7 +23,7 @@ import ( "testing" "time" - "github.com/google/cadvisor/info" + info "github.com/google/cadvisor/info/v1" "github.com/google/cadvisor/storage" "github.com/google/cadvisor/storage/test" influxdb "github.com/influxdb/influxdb/client" diff --git a/storage/memory/memory.go b/storage/memory/memory.go index e19afb4a..2d5b14a3 100644 --- a/storage/memory/memory.go +++ b/storage/memory/memory.go @@ -20,7 +20,7 @@ import ( "time" "github.com/golang/glog" - "github.com/google/cadvisor/info" + info "github.com/google/cadvisor/info/v1" "github.com/google/cadvisor/storage" ) diff --git a/storage/memory/memory_test.go b/storage/memory/memory_test.go index 12d51c9d..2b2059f8 100644 --- a/storage/memory/memory_test.go +++ b/storage/memory/memory_test.go @@ -18,7 +18,7 @@ import ( "testing" "time" - "github.com/google/cadvisor/info" + info "github.com/google/cadvisor/info/v1" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/storage/memory/stats_buffer.go b/storage/memory/stats_buffer.go index 5d69a343..a1ed7458 100644 --- a/storage/memory/stats_buffer.go +++ b/storage/memory/stats_buffer.go @@ -18,7 +18,7 @@ import ( "sort" "time" - "github.com/google/cadvisor/info" + info "github.com/google/cadvisor/info/v1" ) // A circular buffer for ContainerStats. diff --git a/storage/memory/stats_buffer_test.go b/storage/memory/stats_buffer_test.go index ba4bda14..4ac28e63 100644 --- a/storage/memory/stats_buffer_test.go +++ b/storage/memory/stats_buffer_test.go @@ -20,7 +20,7 @@ import ( "testing" "time" - "github.com/google/cadvisor/info" + info "github.com/google/cadvisor/info/v1" "github.com/stretchr/testify/assert" ) diff --git a/storage/storage.go b/storage/storage.go index 58a51ce0..3404b9a1 100644 --- a/storage/storage.go +++ b/storage/storage.go @@ -14,7 +14,7 @@ package storage -import "github.com/google/cadvisor/info" +import info "github.com/google/cadvisor/info/v1" type StorageDriver interface { AddStats(ref info.ContainerReference, stats *info.ContainerStats) error diff --git a/storage/test/mock.go b/storage/test/mock.go index c0f923e6..f29bbdfb 100644 --- a/storage/test/mock.go +++ b/storage/test/mock.go @@ -15,7 +15,7 @@ package test import ( - "github.com/google/cadvisor/info" + info "github.com/google/cadvisor/info/v1" "github.com/stretchr/testify/mock" ) diff --git a/storage/test/storagetests.go b/storage/test/storagetests.go index 1b6ec67f..bbaba0bb 100644 --- a/storage/test/storagetests.go +++ b/storage/test/storagetests.go @@ -20,7 +20,7 @@ import ( "testing" "time" - "github.com/google/cadvisor/info" + info "github.com/google/cadvisor/info/v1" "github.com/google/cadvisor/storage" ) diff --git a/summary/buffer.go b/summary/buffer.go index 1f0dd7df..5ba7ff67 100644 --- a/summary/buffer.go +++ b/summary/buffer.go @@ -15,7 +15,7 @@ package summary import ( - "github.com/google/cadvisor/info" + info "github.com/google/cadvisor/info/v1" ) // Manages a buffer of usage samples. diff --git a/summary/buffer_test.go b/summary/buffer_test.go index b99af9ef..fecf4e71 100644 --- a/summary/buffer_test.go +++ b/summary/buffer_test.go @@ -18,7 +18,7 @@ import ( "reflect" "testing" - "github.com/google/cadvisor/info" + info "github.com/google/cadvisor/info/v1" ) func createSample(i uint64) info.Usage { diff --git a/summary/percentiles.go b/summary/percentiles.go index 59075c2a..3be7bf8c 100644 --- a/summary/percentiles.go +++ b/summary/percentiles.go @@ -22,7 +22,7 @@ import ( "sort" "github.com/golang/glog" - "github.com/google/cadvisor/info" + info "github.com/google/cadvisor/info/v1" ) const secondsToMilliSeconds = 1000 diff --git a/summary/percentiles_test.go b/summary/percentiles_test.go index 38f13051..2c6ef107 100644 --- a/summary/percentiles_test.go +++ b/summary/percentiles_test.go @@ -18,7 +18,7 @@ import ( "testing" "time" - "github.com/google/cadvisor/info" + info "github.com/google/cadvisor/info/v1" ) const Nanosecond = 1000000000 diff --git a/summary/summary.go b/summary/summary.go index 2adfbcb4..0c97ddef 100644 --- a/summary/summary.go +++ b/summary/summary.go @@ -25,7 +25,7 @@ import ( "sync" "time" - "github.com/google/cadvisor/info" + info "github.com/google/cadvisor/info/v1" ) // Usage fields we track for generating percentiles. diff --git a/utils/cpuload/cpuload.go b/utils/cpuload/cpuload.go index 81b7066d..f1a9ba05 100644 --- a/utils/cpuload/cpuload.go +++ b/utils/cpuload/cpuload.go @@ -18,7 +18,7 @@ import ( "fmt" "github.com/golang/glog" - "github.com/google/cadvisor/info" + info "github.com/google/cadvisor/info/v1" "github.com/google/cadvisor/utils/cpuload/netlink" "github.com/google/cadvisor/utils/cpuload/scheddebug" ) diff --git a/utils/cpuload/netlink/netlink.go b/utils/cpuload/netlink/netlink.go index 0f5f1c51..7ca05f36 100644 --- a/utils/cpuload/netlink/netlink.go +++ b/utils/cpuload/netlink/netlink.go @@ -20,7 +20,7 @@ import ( "fmt" "syscall" - "github.com/google/cadvisor/info" + info "github.com/google/cadvisor/info/v1" ) const ( diff --git a/utils/cpuload/netlink/reader.go b/utils/cpuload/netlink/reader.go index 0e2798c8..8103ed35 100644 --- a/utils/cpuload/netlink/reader.go +++ b/utils/cpuload/netlink/reader.go @@ -19,7 +19,7 @@ import ( "os" "github.com/golang/glog" - "github.com/google/cadvisor/info" + info "github.com/google/cadvisor/info/v1" ) type NetlinkReader struct { diff --git a/utils/cpuload/scheddebug/scheddebug.go b/utils/cpuload/scheddebug/scheddebug.go index 2861fdf0..28057884 100644 --- a/utils/cpuload/scheddebug/scheddebug.go +++ b/utils/cpuload/scheddebug/scheddebug.go @@ -25,7 +25,7 @@ import ( "time" "github.com/golang/glog" - "github.com/google/cadvisor/info" + info "github.com/google/cadvisor/info/v1" "github.com/google/cadvisor/utils" ) diff --git a/utils/sysinfo/sysinfo.go b/utils/sysinfo/sysinfo.go index 421555c0..98de336b 100644 --- a/utils/sysinfo/sysinfo.go +++ b/utils/sysinfo/sysinfo.go @@ -20,7 +20,7 @@ import ( "strconv" "strings" - "github.com/google/cadvisor/info" + info "github.com/google/cadvisor/info/v1" "github.com/google/cadvisor/utils/sysfs" ) diff --git a/utils/sysinfo/sysinfo_test.go b/utils/sysinfo/sysinfo_test.go index 31b22156..f46a0c14 100644 --- a/utils/sysinfo/sysinfo_test.go +++ b/utils/sysinfo/sysinfo_test.go @@ -17,7 +17,7 @@ package sysinfo import ( "testing" - "github.com/google/cadvisor/info" + info "github.com/google/cadvisor/info/v1" "github.com/google/cadvisor/utils/sysfs" "github.com/google/cadvisor/utils/sysfs/fakesysfs" ) diff --git a/info/version.go b/version/version.go similarity index 97% rename from info/version.go rename to version/version.go index 8fb4e39b..f77817c4 100644 --- a/info/version.go +++ b/version/version.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package info +package version // Version of cAdvisor. const VERSION = "0.10.1"