Skip to content

K
k3s
Commit 45a1c6d3 authored by k8s-merge-robot's avatar k8s-merge-robot Committed by GitHub
Browse files
Options

Merge pull request #28140 from ronnielai/dep

Automatic merge from submit-queue Updated cadvisor dependency #21546
parents f2ddd60e 4dfff953
Hide whitespace changes
Inline Side-by-side
Showing with 88 additions and 84 deletions
Godeps/Godeps.json
View file @ 45a1c6d3
...@@ -927,203 +927,203 @@ ...@@ -927,203 +927,203 @@
}, },
{ {
"ImportPath": "github.com/google/cadvisor/api", "ImportPath": "github.com/google/cadvisor/api",
"Comment": "v0.23.6", "Comment": "v0.23.2-25-g51574ec",
"Rev": "4dbefc9b671b81257973a33211fb12370c1a526e" "Rev": "51574ec04ff12ca5a50f0935625ec02437191a06"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/cache/memory", "ImportPath": "github.com/google/cadvisor/cache/memory",
"Comment": "v0.23.6", "Comment": "v0.23.2-25-g51574ec",
"Rev": "4dbefc9b671b81257973a33211fb12370c1a526e" "Rev": "51574ec04ff12ca5a50f0935625ec02437191a06"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/collector", "ImportPath": "github.com/google/cadvisor/collector",
"Comment": "v0.23.6", "Comment": "v0.23.2-25-g51574ec",
"Rev": "4dbefc9b671b81257973a33211fb12370c1a526e" "Rev": "51574ec04ff12ca5a50f0935625ec02437191a06"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/container", "ImportPath": "github.com/google/cadvisor/container",
"Comment": "v0.23.6", "Comment": "v0.23.2-25-g51574ec",
"Rev": "4dbefc9b671b81257973a33211fb12370c1a526e" "Rev": "51574ec04ff12ca5a50f0935625ec02437191a06"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/container/common", "ImportPath": "github.com/google/cadvisor/container/common",
"Comment": "v0.23.6", "Comment": "v0.23.2-25-g51574ec",
"Rev": "4dbefc9b671b81257973a33211fb12370c1a526e" "Rev": "51574ec04ff12ca5a50f0935625ec02437191a06"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/container/docker", "ImportPath": "github.com/google/cadvisor/container/docker",
"Comment": "v0.23.6", "Comment": "v0.23.2-25-g51574ec",
"Rev": "4dbefc9b671b81257973a33211fb12370c1a526e" "Rev": "51574ec04ff12ca5a50f0935625ec02437191a06"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/container/libcontainer", "ImportPath": "github.com/google/cadvisor/container/libcontainer",
"Comment": "v0.23.6", "Comment": "v0.23.2-25-g51574ec",
"Rev": "4dbefc9b671b81257973a33211fb12370c1a526e" "Rev": "51574ec04ff12ca5a50f0935625ec02437191a06"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/container/raw", "ImportPath": "github.com/google/cadvisor/container/raw",
"Comment": "v0.23.6", "Comment": "v0.23.2-25-g51574ec",
"Rev": "4dbefc9b671b81257973a33211fb12370c1a526e" "Rev": "51574ec04ff12ca5a50f0935625ec02437191a06"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/container/rkt", "ImportPath": "github.com/google/cadvisor/container/rkt",
"Comment": "v0.23.6", "Comment": "v0.23.2-25-g51574ec",
"Rev": "4dbefc9b671b81257973a33211fb12370c1a526e" "Rev": "51574ec04ff12ca5a50f0935625ec02437191a06"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/container/systemd", "ImportPath": "github.com/google/cadvisor/container/systemd",
"Comment": "v0.23.6", "Comment": "v0.23.2-25-g51574ec",
"Rev": "4dbefc9b671b81257973a33211fb12370c1a526e" "Rev": "51574ec04ff12ca5a50f0935625ec02437191a06"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/devicemapper", "ImportPath": "github.com/google/cadvisor/devicemapper",
"Comment": "v0.23.6", "Comment": "v0.23.2-25-g51574ec",
"Rev": "4dbefc9b671b81257973a33211fb12370c1a526e" "Rev": "51574ec04ff12ca5a50f0935625ec02437191a06"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/events", "ImportPath": "github.com/google/cadvisor/events",
"Comment": "v0.23.6", "Comment": "v0.23.2-25-g51574ec",
"Rev": "4dbefc9b671b81257973a33211fb12370c1a526e" "Rev": "51574ec04ff12ca5a50f0935625ec02437191a06"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/fs", "ImportPath": "github.com/google/cadvisor/fs",
"Comment": "v0.23.6", "Comment": "v0.23.2-25-g51574ec",
"Rev": "4dbefc9b671b81257973a33211fb12370c1a526e" "Rev": "51574ec04ff12ca5a50f0935625ec02437191a06"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/healthz", "ImportPath": "github.com/google/cadvisor/healthz",
"Comment": "v0.23.6", "Comment": "v0.23.2-25-g51574ec",
"Rev": "4dbefc9b671b81257973a33211fb12370c1a526e" "Rev": "51574ec04ff12ca5a50f0935625ec02437191a06"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/http", "ImportPath": "github.com/google/cadvisor/http",
"Comment": "v0.23.6", "Comment": "v0.23.2-25-g51574ec",
"Rev": "4dbefc9b671b81257973a33211fb12370c1a526e" "Rev": "51574ec04ff12ca5a50f0935625ec02437191a06"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/http/mux", "ImportPath": "github.com/google/cadvisor/http/mux",
"Comment": "v0.23.6", "Comment": "v0.23.2-25-g51574ec",
"Rev": "4dbefc9b671b81257973a33211fb12370c1a526e" "Rev": "51574ec04ff12ca5a50f0935625ec02437191a06"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/info/v1", "ImportPath": "github.com/google/cadvisor/info/v1",
"Comment": "v0.23.6", "Comment": "v0.23.2-25-g51574ec",
"Rev": "4dbefc9b671b81257973a33211fb12370c1a526e" "Rev": "51574ec04ff12ca5a50f0935625ec02437191a06"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/info/v1/test", "ImportPath": "github.com/google/cadvisor/info/v1/test",
"Comment": "v0.23.6", "Comment": "v0.23.2-25-g51574ec",
"Rev": "4dbefc9b671b81257973a33211fb12370c1a526e" "Rev": "51574ec04ff12ca5a50f0935625ec02437191a06"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/info/v2", "ImportPath": "github.com/google/cadvisor/info/v2",
"Comment": "v0.23.6", "Comment": "v0.23.2-25-g51574ec",
"Rev": "4dbefc9b671b81257973a33211fb12370c1a526e" "Rev": "51574ec04ff12ca5a50f0935625ec02437191a06"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/machine", "ImportPath": "github.com/google/cadvisor/machine",
"Comment": "v0.23.6", "Comment": "v0.23.2-25-g51574ec",
"Rev": "4dbefc9b671b81257973a33211fb12370c1a526e" "Rev": "51574ec04ff12ca5a50f0935625ec02437191a06"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/manager", "ImportPath": "github.com/google/cadvisor/manager",
"Comment": "v0.23.6", "Comment": "v0.23.2-25-g51574ec",
"Rev": "4dbefc9b671b81257973a33211fb12370c1a526e" "Rev": "51574ec04ff12ca5a50f0935625ec02437191a06"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/manager/watcher", "ImportPath": "github.com/google/cadvisor/manager/watcher",
"Comment": "v0.23.6", "Comment": "v0.23.2-25-g51574ec",
"Rev": "4dbefc9b671b81257973a33211fb12370c1a526e" "Rev": "51574ec04ff12ca5a50f0935625ec02437191a06"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/manager/watcher/raw", "ImportPath": "github.com/google/cadvisor/manager/watcher/raw",
"Comment": "v0.23.6", "Comment": "v0.23.2-25-g51574ec",
"Rev": "4dbefc9b671b81257973a33211fb12370c1a526e" "Rev": "51574ec04ff12ca5a50f0935625ec02437191a06"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/manager/watcher/rkt", "ImportPath": "github.com/google/cadvisor/manager/watcher/rkt",
"Comment": "v0.23.6", "Comment": "v0.23.2-25-g51574ec",
"Rev": "4dbefc9b671b81257973a33211fb12370c1a526e" "Rev": "51574ec04ff12ca5a50f0935625ec02437191a06"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/metrics", "ImportPath": "github.com/google/cadvisor/metrics",
"Comment": "v0.23.6", "Comment": "v0.23.2-25-g51574ec",
"Rev": "4dbefc9b671b81257973a33211fb12370c1a526e" "Rev": "51574ec04ff12ca5a50f0935625ec02437191a06"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/pages", "ImportPath": "github.com/google/cadvisor/pages",
"Comment": "v0.23.6", "Comment": "v0.23.2-25-g51574ec",
"Rev": "4dbefc9b671b81257973a33211fb12370c1a526e" "Rev": "51574ec04ff12ca5a50f0935625ec02437191a06"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/pages/static", "ImportPath": "github.com/google/cadvisor/pages/static",
"Comment": "v0.23.6", "Comment": "v0.23.2-25-g51574ec",
"Rev": "4dbefc9b671b81257973a33211fb12370c1a526e" "Rev": "51574ec04ff12ca5a50f0935625ec02437191a06"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/storage", "ImportPath": "github.com/google/cadvisor/storage",
"Comment": "v0.23.6", "Comment": "v0.23.2-25-g51574ec",
"Rev": "4dbefc9b671b81257973a33211fb12370c1a526e" "Rev": "51574ec04ff12ca5a50f0935625ec02437191a06"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/summary", "ImportPath": "github.com/google/cadvisor/summary",
"Comment": "v0.23.6", "Comment": "v0.23.2-25-g51574ec",
"Rev": "4dbefc9b671b81257973a33211fb12370c1a526e" "Rev": "51574ec04ff12ca5a50f0935625ec02437191a06"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/utils", "ImportPath": "github.com/google/cadvisor/utils",
"Comment": "v0.23.6", "Comment": "v0.23.2-25-g51574ec",
"Rev": "4dbefc9b671b81257973a33211fb12370c1a526e" "Rev": "51574ec04ff12ca5a50f0935625ec02437191a06"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/utils/cloudinfo", "ImportPath": "github.com/google/cadvisor/utils/cloudinfo",
"Comment": "v0.23.6", "Comment": "v0.23.2-25-g51574ec",
"Rev": "4dbefc9b671b81257973a33211fb12370c1a526e" "Rev": "51574ec04ff12ca5a50f0935625ec02437191a06"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/utils/cpuload", "ImportPath": "github.com/google/cadvisor/utils/cpuload",
"Comment": "v0.23.6", "Comment": "v0.23.2-25-g51574ec",
"Rev": "4dbefc9b671b81257973a33211fb12370c1a526e" "Rev": "51574ec04ff12ca5a50f0935625ec02437191a06"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/utils/cpuload/netlink", "ImportPath": "github.com/google/cadvisor/utils/cpuload/netlink",
"Comment": "v0.23.6", "Comment": "v0.23.2-25-g51574ec",
"Rev": "4dbefc9b671b81257973a33211fb12370c1a526e" "Rev": "51574ec04ff12ca5a50f0935625ec02437191a06"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/utils/docker", "ImportPath": "github.com/google/cadvisor/utils/docker",
"Comment": "v0.23.6", "Comment": "v0.23.2-25-g51574ec",
"Rev": "4dbefc9b671b81257973a33211fb12370c1a526e" "Rev": "51574ec04ff12ca5a50f0935625ec02437191a06"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/utils/oomparser", "ImportPath": "github.com/google/cadvisor/utils/oomparser",
"Comment": "v0.23.6", "Comment": "v0.23.2-25-g51574ec",
"Rev": "4dbefc9b671b81257973a33211fb12370c1a526e" "Rev": "51574ec04ff12ca5a50f0935625ec02437191a06"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/utils/sysfs", "ImportPath": "github.com/google/cadvisor/utils/sysfs",
"Comment": "v0.23.6", "Comment": "v0.23.2-25-g51574ec",
"Rev": "4dbefc9b671b81257973a33211fb12370c1a526e" "Rev": "51574ec04ff12ca5a50f0935625ec02437191a06"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/utils/sysinfo", "ImportPath": "github.com/google/cadvisor/utils/sysinfo",
"Comment": "v0.23.6", "Comment": "v0.23.2-25-g51574ec",
"Rev": "4dbefc9b671b81257973a33211fb12370c1a526e" "Rev": "51574ec04ff12ca5a50f0935625ec02437191a06"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/utils/tail", "ImportPath": "github.com/google/cadvisor/utils/tail",
"Comment": "v0.23.6", "Comment": "v0.23.2-25-g51574ec",
"Rev": "4dbefc9b671b81257973a33211fb12370c1a526e" "Rev": "51574ec04ff12ca5a50f0935625ec02437191a06"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/validate", "ImportPath": "github.com/google/cadvisor/validate",
"Comment": "v0.23.6", "Comment": "v0.23.2-25-g51574ec",
"Rev": "4dbefc9b671b81257973a33211fb12370c1a526e" "Rev": "51574ec04ff12ca5a50f0935625ec02437191a06"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/version", "ImportPath": "github.com/google/cadvisor/version",
"Comment": "v0.23.6", "Comment": "v0.23.2-25-g51574ec",
"Rev": "4dbefc9b671b81257973a33211fb12370c1a526e" "Rev": "51574ec04ff12ca5a50f0935625ec02437191a06"
}, },
{ {
"ImportPath": "github.com/google/gofuzz", "ImportPath": "github.com/google/gofuzz",
......
vendor/github.com/google/cadvisor/info/v2/container.go
View file @ 45a1c6d3
...@@ -216,6 +216,9 @@ type FsInfo struct { ...@@ -216,6 +216,9 @@ type FsInfo struct {
// Labels associated with this filesystem. // Labels associated with this filesystem.
Labels []string `json:"labels"` Labels []string `json:"labels"`
// Number of available Inodes.
InodesFree uint64 `json:"inodes_free"`
} }
type RequestOptions struct { type RequestOptions struct {
......
vendor/github.com/google/cadvisor/manager/manager.go
View file @ 45a1c6d3
...@@ -232,12 +232,12 @@ type manager struct { ...@@ -232,12 +232,12 @@ type manager struct {
func (self *manager) Start() error { func (self *manager) Start() error {
err := docker.Register(self, self.fsInfo, self.ignoreMetrics) err := docker.Register(self, self.fsInfo, self.ignoreMetrics)
if err != nil { 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) err = rkt.Register(self, self.fsInfo, self.ignoreMetrics)
if err != nil { 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 { } else {
watcher, err := rktwatcher.NewRktContainerWatcher() watcher, err := rktwatcher.NewRktContainerWatcher()
if err != nil { if err != nil {
...@@ -248,7 +248,7 @@ func (self *manager) Start() error { ...@@ -248,7 +248,7 @@ func (self *manager) Start() error {
err = systemd.Register(self, self.fsInfo, self.ignoreMetrics) err = systemd.Register(self, self.fsInfo, self.ignoreMetrics)
if err != nil { 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) err = raw.Register(self, self.fsInfo, self.ignoreMetrics)
...@@ -687,6 +687,7 @@ func (self *manager) GetFsInfo(label string) ([]v2.FsInfo, error) { ...@@ -687,6 +687,7 @@ func (self *manager) GetFsInfo(label string) ([]v2.FsInfo, error) {
Usage: fs.Usage, Usage: fs.Usage,
Available: fs.Available, Available: fs.Available,
Labels: labels, Labels: labels,
InodesFree: fs.InodesFree,
} }
fsInfo = append(fsInfo, fi) fsInfo = append(fsInfo, fi)
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment