Update cadvisor dependency

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

View File

@@ -216,6 +216,9 @@ type FsInfo struct {
// Labels associated with this filesystem.
Labels []string `json:"labels"`
// Number of available Inodes.
InodesFree uint64 `json:"inodes_free"`
}
type RequestOptions struct {

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)
}

View File

@@ -1 +1 @@
0.23.4
0.23.6