Skip to content

K
k3s
Commit 34dcea30 authored by Dawn Chen's avatar Dawn Chen
Browse files
Options

Merge pull request #27065 from timstclair/cadvisor-godeps

Bump cAdvisor to v0.23.3
parents 6986a3b2 cf1ee6c6
Hide whitespace changes
Inline Side-by-side
Showing with 112 additions and 84 deletions
Godeps/Godeps.json
View file @ 34dcea30
{ {
"ImportPath": "k8s.io/kubernetes", "ImportPath": "k8s.io/kubernetes",
"GoVersion": "go1.6", "GoVersion": "go1.6",
"GodepVersion": "v68", "GodepVersion": "v69",
"Packages": [ "Packages": [
"github.com/ugorji/go/codec/codecgen", "github.com/ugorji/go/codec/codecgen",
"github.com/onsi/ginkgo/ginkgo", "github.com/onsi/ginkgo/ginkgo",
...@@ -922,203 +922,203 @@ ...@@ -922,203 +922,203 @@
}, },
{ {
"ImportPath": "github.com/google/cadvisor/api", "ImportPath": "github.com/google/cadvisor/api",
"Comment": "v0.23.2", "Comment": "v0.23.3",
"Rev": "7ddf6eb5d1f84363fbc181a498313a880b12ba07" "Rev": "6607e7cf50dfc2ef115f5099c6246e3384fbc9a7"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/cache/memory", "ImportPath": "github.com/google/cadvisor/cache/memory",
"Comment": "v0.23.2", "Comment": "v0.23.3",
"Rev": "7ddf6eb5d1f84363fbc181a498313a880b12ba07" "Rev": "6607e7cf50dfc2ef115f5099c6246e3384fbc9a7"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/collector", "ImportPath": "github.com/google/cadvisor/collector",
"Comment": "v0.23.2", "Comment": "v0.23.3",
"Rev": "7ddf6eb5d1f84363fbc181a498313a880b12ba07" "Rev": "6607e7cf50dfc2ef115f5099c6246e3384fbc9a7"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/container", "ImportPath": "github.com/google/cadvisor/container",
"Comment": "v0.23.2", "Comment": "v0.23.3",
"Rev": "7ddf6eb5d1f84363fbc181a498313a880b12ba07" "Rev": "6607e7cf50dfc2ef115f5099c6246e3384fbc9a7"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/container/common", "ImportPath": "github.com/google/cadvisor/container/common",
"Comment": "v0.23.2", "Comment": "v0.23.3",
"Rev": "7ddf6eb5d1f84363fbc181a498313a880b12ba07" "Rev": "6607e7cf50dfc2ef115f5099c6246e3384fbc9a7"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/container/docker", "ImportPath": "github.com/google/cadvisor/container/docker",
"Comment": "v0.23.2", "Comment": "v0.23.3",
"Rev": "7ddf6eb5d1f84363fbc181a498313a880b12ba07" "Rev": "6607e7cf50dfc2ef115f5099c6246e3384fbc9a7"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/container/libcontainer", "ImportPath": "github.com/google/cadvisor/container/libcontainer",
"Comment": "v0.23.2", "Comment": "v0.23.3",
"Rev": "7ddf6eb5d1f84363fbc181a498313a880b12ba07" "Rev": "6607e7cf50dfc2ef115f5099c6246e3384fbc9a7"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/container/raw", "ImportPath": "github.com/google/cadvisor/container/raw",
"Comment": "v0.23.2", "Comment": "v0.23.3",
"Rev": "7ddf6eb5d1f84363fbc181a498313a880b12ba07" "Rev": "6607e7cf50dfc2ef115f5099c6246e3384fbc9a7"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/container/rkt", "ImportPath": "github.com/google/cadvisor/container/rkt",
"Comment": "v0.23.2", "Comment": "v0.23.3",
"Rev": "7ddf6eb5d1f84363fbc181a498313a880b12ba07" "Rev": "6607e7cf50dfc2ef115f5099c6246e3384fbc9a7"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/container/systemd", "ImportPath": "github.com/google/cadvisor/container/systemd",
"Comment": "v0.23.2", "Comment": "v0.23.3",
"Rev": "7ddf6eb5d1f84363fbc181a498313a880b12ba07" "Rev": "6607e7cf50dfc2ef115f5099c6246e3384fbc9a7"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/devicemapper", "ImportPath": "github.com/google/cadvisor/devicemapper",
"Comment": "v0.23.2", "Comment": "v0.23.3",
"Rev": "7ddf6eb5d1f84363fbc181a498313a880b12ba07" "Rev": "6607e7cf50dfc2ef115f5099c6246e3384fbc9a7"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/events", "ImportPath": "github.com/google/cadvisor/events",
"Comment": "v0.23.2", "Comment": "v0.23.3",
"Rev": "7ddf6eb5d1f84363fbc181a498313a880b12ba07" "Rev": "6607e7cf50dfc2ef115f5099c6246e3384fbc9a7"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/fs", "ImportPath": "github.com/google/cadvisor/fs",
"Comment": "v0.23.2", "Comment": "v0.23.3",
"Rev": "7ddf6eb5d1f84363fbc181a498313a880b12ba07" "Rev": "6607e7cf50dfc2ef115f5099c6246e3384fbc9a7"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/healthz", "ImportPath": "github.com/google/cadvisor/healthz",
"Comment": "v0.23.2", "Comment": "v0.23.3",
"Rev": "7ddf6eb5d1f84363fbc181a498313a880b12ba07" "Rev": "6607e7cf50dfc2ef115f5099c6246e3384fbc9a7"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/http", "ImportPath": "github.com/google/cadvisor/http",
"Comment": "v0.23.2", "Comment": "v0.23.3",
"Rev": "7ddf6eb5d1f84363fbc181a498313a880b12ba07" "Rev": "6607e7cf50dfc2ef115f5099c6246e3384fbc9a7"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/http/mux", "ImportPath": "github.com/google/cadvisor/http/mux",
"Comment": "v0.23.2", "Comment": "v0.23.3",
"Rev": "7ddf6eb5d1f84363fbc181a498313a880b12ba07" "Rev": "6607e7cf50dfc2ef115f5099c6246e3384fbc9a7"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/info/v1", "ImportPath": "github.com/google/cadvisor/info/v1",
"Comment": "v0.23.2", "Comment": "v0.23.3",
"Rev": "7ddf6eb5d1f84363fbc181a498313a880b12ba07" "Rev": "6607e7cf50dfc2ef115f5099c6246e3384fbc9a7"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/info/v1/test", "ImportPath": "github.com/google/cadvisor/info/v1/test",
"Comment": "v0.23.2", "Comment": "v0.23.3",
"Rev": "7ddf6eb5d1f84363fbc181a498313a880b12ba07" "Rev": "6607e7cf50dfc2ef115f5099c6246e3384fbc9a7"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/info/v2", "ImportPath": "github.com/google/cadvisor/info/v2",
"Comment": "v0.23.2", "Comment": "v0.23.3",
"Rev": "7ddf6eb5d1f84363fbc181a498313a880b12ba07" "Rev": "6607e7cf50dfc2ef115f5099c6246e3384fbc9a7"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/machine", "ImportPath": "github.com/google/cadvisor/machine",
"Comment": "v0.23.2", "Comment": "v0.23.3",
"Rev": "7ddf6eb5d1f84363fbc181a498313a880b12ba07" "Rev": "6607e7cf50dfc2ef115f5099c6246e3384fbc9a7"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/manager", "ImportPath": "github.com/google/cadvisor/manager",
"Comment": "v0.23.2", "Comment": "v0.23.3",
"Rev": "7ddf6eb5d1f84363fbc181a498313a880b12ba07" "Rev": "6607e7cf50dfc2ef115f5099c6246e3384fbc9a7"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/manager/watcher", "ImportPath": "github.com/google/cadvisor/manager/watcher",
"Comment": "v0.23.2", "Comment": "v0.23.3",
"Rev": "7ddf6eb5d1f84363fbc181a498313a880b12ba07" "Rev": "6607e7cf50dfc2ef115f5099c6246e3384fbc9a7"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/manager/watcher/raw", "ImportPath": "github.com/google/cadvisor/manager/watcher/raw",
"Comment": "v0.23.2", "Comment": "v0.23.3",
"Rev": "7ddf6eb5d1f84363fbc181a498313a880b12ba07" "Rev": "6607e7cf50dfc2ef115f5099c6246e3384fbc9a7"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/manager/watcher/rkt", "ImportPath": "github.com/google/cadvisor/manager/watcher/rkt",
"Comment": "v0.23.2", "Comment": "v0.23.3",
"Rev": "7ddf6eb5d1f84363fbc181a498313a880b12ba07" "Rev": "6607e7cf50dfc2ef115f5099c6246e3384fbc9a7"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/metrics", "ImportPath": "github.com/google/cadvisor/metrics",
"Comment": "v0.23.2", "Comment": "v0.23.3",
"Rev": "7ddf6eb5d1f84363fbc181a498313a880b12ba07" "Rev": "6607e7cf50dfc2ef115f5099c6246e3384fbc9a7"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/pages", "ImportPath": "github.com/google/cadvisor/pages",
"Comment": "v0.23.2", "Comment": "v0.23.3",
"Rev": "7ddf6eb5d1f84363fbc181a498313a880b12ba07" "Rev": "6607e7cf50dfc2ef115f5099c6246e3384fbc9a7"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/pages/static", "ImportPath": "github.com/google/cadvisor/pages/static",
"Comment": "v0.23.2", "Comment": "v0.23.3",
"Rev": "7ddf6eb5d1f84363fbc181a498313a880b12ba07" "Rev": "6607e7cf50dfc2ef115f5099c6246e3384fbc9a7"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/storage", "ImportPath": "github.com/google/cadvisor/storage",
"Comment": "v0.23.2", "Comment": "v0.23.3",
"Rev": "7ddf6eb5d1f84363fbc181a498313a880b12ba07" "Rev": "6607e7cf50dfc2ef115f5099c6246e3384fbc9a7"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/summary", "ImportPath": "github.com/google/cadvisor/summary",
"Comment": "v0.23.2", "Comment": "v0.23.3",
"Rev": "7ddf6eb5d1f84363fbc181a498313a880b12ba07" "Rev": "6607e7cf50dfc2ef115f5099c6246e3384fbc9a7"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/utils", "ImportPath": "github.com/google/cadvisor/utils",
"Comment": "v0.23.2", "Comment": "v0.23.3",
"Rev": "7ddf6eb5d1f84363fbc181a498313a880b12ba07" "Rev": "6607e7cf50dfc2ef115f5099c6246e3384fbc9a7"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/utils/cloudinfo", "ImportPath": "github.com/google/cadvisor/utils/cloudinfo",
"Comment": "v0.23.2", "Comment": "v0.23.3",
"Rev": "7ddf6eb5d1f84363fbc181a498313a880b12ba07" "Rev": "6607e7cf50dfc2ef115f5099c6246e3384fbc9a7"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/utils/cpuload", "ImportPath": "github.com/google/cadvisor/utils/cpuload",
"Comment": "v0.23.2", "Comment": "v0.23.3",
"Rev": "7ddf6eb5d1f84363fbc181a498313a880b12ba07" "Rev": "6607e7cf50dfc2ef115f5099c6246e3384fbc9a7"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/utils/cpuload/netlink", "ImportPath": "github.com/google/cadvisor/utils/cpuload/netlink",
"Comment": "v0.23.2", "Comment": "v0.23.3",
"Rev": "7ddf6eb5d1f84363fbc181a498313a880b12ba07" "Rev": "6607e7cf50dfc2ef115f5099c6246e3384fbc9a7"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/utils/docker", "ImportPath": "github.com/google/cadvisor/utils/docker",
"Comment": "v0.23.2", "Comment": "v0.23.3",
"Rev": "7ddf6eb5d1f84363fbc181a498313a880b12ba07" "Rev": "6607e7cf50dfc2ef115f5099c6246e3384fbc9a7"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/utils/oomparser", "ImportPath": "github.com/google/cadvisor/utils/oomparser",
"Comment": "v0.23.2", "Comment": "v0.23.3",
"Rev": "7ddf6eb5d1f84363fbc181a498313a880b12ba07" "Rev": "6607e7cf50dfc2ef115f5099c6246e3384fbc9a7"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/utils/sysfs", "ImportPath": "github.com/google/cadvisor/utils/sysfs",
"Comment": "v0.23.2", "Comment": "v0.23.3",
"Rev": "7ddf6eb5d1f84363fbc181a498313a880b12ba07" "Rev": "6607e7cf50dfc2ef115f5099c6246e3384fbc9a7"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/utils/sysinfo", "ImportPath": "github.com/google/cadvisor/utils/sysinfo",
"Comment": "v0.23.2", "Comment": "v0.23.3",
"Rev": "7ddf6eb5d1f84363fbc181a498313a880b12ba07" "Rev": "6607e7cf50dfc2ef115f5099c6246e3384fbc9a7"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/utils/tail", "ImportPath": "github.com/google/cadvisor/utils/tail",
"Comment": "v0.23.2", "Comment": "v0.23.3",
"Rev": "7ddf6eb5d1f84363fbc181a498313a880b12ba07" "Rev": "6607e7cf50dfc2ef115f5099c6246e3384fbc9a7"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/validate", "ImportPath": "github.com/google/cadvisor/validate",
"Comment": "v0.23.2", "Comment": "v0.23.3",
"Rev": "7ddf6eb5d1f84363fbc181a498313a880b12ba07" "Rev": "6607e7cf50dfc2ef115f5099c6246e3384fbc9a7"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/version", "ImportPath": "github.com/google/cadvisor/version",
"Comment": "v0.23.2", "Comment": "v0.23.3",
"Rev": "7ddf6eb5d1f84363fbc181a498313a880b12ba07" "Rev": "6607e7cf50dfc2ef115f5099c6246e3384fbc9a7"
}, },
{ {
"ImportPath": "github.com/google/gofuzz", "ImportPath": "github.com/google/gofuzz",
......
vendor/github.com/google/cadvisor/collector/prometheus_collector.go
View file @ 34dcea30
...@@ -120,12 +120,18 @@ func (collector *PrometheusCollector) GetSpec() []v1.MetricSpec { ...@@ -120,12 +120,18 @@ func (collector *PrometheusCollector) GetSpec() []v1.MetricSpec {
} }
lines := strings.Split(string(pageContent), "\n") lines := strings.Split(string(pageContent), "\n")
lineCount := len(lines)
for i, line := range lines { for i, line := range lines {
if strings.HasPrefix(line, "# HELP") { if strings.HasPrefix(line, "# HELP") {
stopIndex := strings.Index(lines[i+2], "{") if i+2 >= lineCount {
break
}
stopIndex := strings.IndexAny(lines[i+2], "{ ")
if stopIndex == -1 { if stopIndex == -1 {
stopIndex = strings.Index(lines[i+2], " ") continue
} }
name := strings.TrimSpace(lines[i+2][0:stopIndex]) name := strings.TrimSpace(lines[i+2][0:stopIndex])
if _, ok := collector.metricsSet[name]; collector.metricsSet != nil && !ok { if _, ok := collector.metricsSet[name]; collector.metricsSet != nil && !ok {
continue continue
......
vendor/github.com/google/cadvisor/fs/fs.go
View file @ 34dcea30
...@@ -44,6 +44,26 @@ const ( ...@@ -44,6 +44,26 @@ const (
LabelRktImages = "rkt-images" LabelRktImages = "rkt-images"
) )
// The maximum number of `du` tasks that can be running at once.
const maxConsecutiveDus = 20
// A pool for restricting the number of consecutive `du` tasks running.
var duPool = make(chan struct{}, maxConsecutiveDus)
func init() {
for i := 0; i < maxConsecutiveDus; i++ {
releaseDuToken()
}
}
func claimDuToken() {
<-duPool
}
func releaseDuToken() {
duPool <- struct{}{}
}
type partition struct { type partition struct {
mountpoint string mountpoint string
major uint major uint
...@@ -391,6 +411,8 @@ func (self *RealFsInfo) GetDirUsage(dir string, timeout time.Duration) (uint64, ...@@ -391,6 +411,8 @@ func (self *RealFsInfo) GetDirUsage(dir string, timeout time.Duration) (uint64,
if dir == "" { if dir == "" {
return 0, fmt.Errorf("invalid directory") return 0, fmt.Errorf("invalid directory")
} }
claimDuToken()
defer releaseDuToken()
cmd := exec.Command("nice", "-n", "19", "du", "-s", dir) cmd := exec.Command("nice", "-n", "19", "du", "-s", dir)
stdoutp, err := cmd.StdoutPipe() stdoutp, err := cmd.StdoutPipe()
if err != nil { if err != nil {
......
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