Update cadvisor version to latest version
This commit is contained in:
20
vendor/github.com/google/cadvisor/utils/docker/docker.go
generated
vendored
20
vendor/github.com/google/cadvisor/utils/docker/docker.go
generated
vendored
@@ -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
|
||||
}
|
||||
|
||||
4
vendor/github.com/google/cadvisor/utils/sysfs/sysfs.go
generated
vendored
4
vendor/github.com/google/cadvisor/utils/sysfs/sysfs.go
generated
vendored
@@ -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) {
|
||||
|
||||
5
vendor/github.com/google/cadvisor/utils/sysinfo/sysinfo.go
generated
vendored
5
vendor/github.com/google/cadvisor/utils/sysinfo/sysinfo.go
generated
vendored
@@ -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)
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user