Move utils/machine -> machine

container/docker/docker.go

@@ -24,7 +24,7 @@ import (
 	"golang.org/x/net/context"
 
 	"github.com/google/cadvisor/info/v1"
-	"github.com/google/cadvisor/utils/machine"
+	"github.com/google/cadvisor/machine"
 )
 
 func Status() (v1.DockerStatus, error) {

container/raw/handler.go

@@ -26,7 +26,7 @@ import (
 	"github.com/google/cadvisor/container/libcontainer"
 	"github.com/google/cadvisor/fs"
 	info "github.com/google/cadvisor/info/v1"
-	"github.com/google/cadvisor/utils/machine"
+	"github.com/google/cadvisor/machine"
 
 	"github.com/golang/glog"
 	"github.com/opencontainers/runc/libcontainer/cgroups"

machine/machine.go

@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+// The machine package contains functions that extract machine-level specs.
 package machine
 
 import (
@@ -33,8 +34,6 @@ import (
 	"github.com/golang/glog"
 )
 
-// The utils/machine package contains functions that extract machine-level specs.
-
 var (
 	cpuRegExp  = regexp.MustCompile(`^processor\s*:\s*([0-9]+)$`)
 	coreRegExp = regexp.MustCompile(`^core id\s*:\s*([0-9]+)$`)

manager/manager.go

@@ -36,8 +36,8 @@ import (
 	"github.com/google/cadvisor/fs"
 	info "github.com/google/cadvisor/info/v1"
 	"github.com/google/cadvisor/info/v2"
+	"github.com/google/cadvisor/machine"
 	"github.com/google/cadvisor/utils/cpuload"
-	"github.com/google/cadvisor/utils/machine"
 	"github.com/google/cadvisor/utils/oomparser"
 	"github.com/google/cadvisor/utils/sysfs"
 	"github.com/google/cadvisor/version"