Update cadvisor version to latest version

This commit is contained in:
Manjunath A Kumatagi
2017-04-04 13:20:20 -04:00
parent e36cca4b5d
commit 2b42d71a94
18 changed files with 594 additions and 106 deletions

View File

@@ -23,11 +23,12 @@ import (
)
const (
DockerInfoDriver = "Driver"
DockerInfoDriverStatus = "DriverStatus"
DriverStatusPoolName = "Pool Name"
DriverStatusDataLoopFile = "Data loop file"
DriverStatusMetadataFile = "Metadata file"
DockerInfoDriver = "Driver"
DockerInfoDriverStatus = "DriverStatus"
DriverStatusPoolName = "Pool Name"
DriverStatusDataLoopFile = "Data loop file"
DriverStatusMetadataFile = "Metadata file"
DriverStatusParentDataset = "Parent Dataset"
)
func DriverStatusValue(status [][2]string, target string) string {
@@ -68,3 +69,12 @@ func DockerMetadataDevice(info dockertypes.Info) (string, error) {
return metadataDevice, nil
}
func DockerZfsFilesystem(info dockertypes.Info) (string, error) {
filesystem := DriverStatusValue(info.DriverStatus, DriverStatusParentDataset)
if len(filesystem) == 0 {
return "", fmt.Errorf("Could not get zfs filesystem")
}
return filesystem, nil
}

View File

@@ -70,8 +70,8 @@ type SysFs interface {
type realSysFs struct{}
func NewRealSysFs() (SysFs, error) {
return &realSysFs{}, nil
func NewRealSysFs() SysFs {
return &realSysFs{}
}
func (self *realSysFs) GetBlockDevices() ([]os.FileInfo, error) {

View File

@@ -155,10 +155,7 @@ func GetCacheInfo(sysFs sysfs.SysFs, id int) ([]sysfs.CacheInfo, error) {
func GetNetworkStats(name string) (info.InterfaceStats, error) {
// TODO(rjnagal): Take syfs as an argument.
sysFs, err := sysfs.NewRealSysFs()
if err != nil {
return info.InterfaceStats{}, err
}
sysFs := sysfs.NewRealSysFs()
return getNetworkStats(name, sysFs)
}