github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update cadvisor dependency

Browse Source
This commit is contained in:
Ron Lai
2016-06-27 18:29:20 -07:00
parent 90f47644f6
commit 4dfff9533b
4 changed files with 88 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
vendor/github.com/google/cadvisor/manager/manager.go generated vendored
View File

@@ -232,12 +232,12 @@ type manager struct {
func (self *manager) Start() error {
err := docker.Register(self, self.fsInfo, self.ignoreMetrics)
if err != nil {
glog.Errorf("Docker container factory registration failed: %v.", err)
glog.Warningf("Docker container factory registration failed: %v.", err)
}
err = rkt.Register(self, self.fsInfo, self.ignoreMetrics)
if err != nil {
glog.Errorf("Registration of the rkt container factory failed: %v", err)
glog.Warningf("Registration of the rkt container factory failed: %v", err)
} else {
watcher, err := rktwatcher.NewRktContainerWatcher()
if err != nil {
@@ -248,7 +248,7 @@ func (self *manager) Start() error {
err = systemd.Register(self, self.fsInfo, self.ignoreMetrics)
if err != nil {
glog.Errorf("Registration of the systemd container factory failed: %v", err)
glog.Warningf("Registration of the systemd container factory failed: %v", err)
}
err = raw.Register(self, self.fsInfo, self.ignoreMetrics)
@@ -687,6 +687,7 @@ func (self *manager) GetFsInfo(label string) ([]v2.FsInfo, error) {
Usage: fs.Usage,
Available: fs.Available,
Labels: labels,
InodesFree: fs.InodesFree,
}
fsInfo = append(fsInfo, fi)
}