github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #27065 from timstclair/cadvisor-godeps 

Bump cAdvisor to v0.23.3
pull/6/head
Dawn Chen 2016-06-08 17:21:08 -07:00
parent 6986a3b2e2 cf1ee6c694
commit 34dcea3037
4 changed files with 113 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

162
Godeps/Godeps.json generated
View File

@ -1,7 +1,7 @@
{
"ImportPath": "k8s.io/kubernetes",
"GoVersion": "go1.6",
"GodepVersion": "v68",
"GodepVersion": "v69",
"Packages": [
"github.com/ugorji/go/codec/codecgen",
"github.com/onsi/ginkgo/ginkgo",
@ -922,203 +922,203 @@
},
{
"ImportPath": "github.com/google/cadvisor/api",
"Comment": "v0.23.2",
"Rev": "7ddf6eb5d1f84363fbc181a498313a880b12ba07"
"Comment": "v0.23.3",
"Rev": "6607e7cf50dfc2ef115f5099c6246e3384fbc9a7"
},
{
"ImportPath": "github.com/google/cadvisor/cache/memory",
"Comment": "v0.23.2",
"Rev": "7ddf6eb5d1f84363fbc181a498313a880b12ba07"
"Comment": "v0.23.3",
"Rev": "6607e7cf50dfc2ef115f5099c6246e3384fbc9a7"
},
{
"ImportPath": "github.com/google/cadvisor/collector",
"Comment": "v0.23.2",
"Rev": "7ddf6eb5d1f84363fbc181a498313a880b12ba07"
"Comment": "v0.23.3",
"Rev": "6607e7cf50dfc2ef115f5099c6246e3384fbc9a7"
},
{
"ImportPath": "github.com/google/cadvisor/container",
"Comment": "v0.23.2",
"Rev": "7ddf6eb5d1f84363fbc181a498313a880b12ba07"
"Comment": "v0.23.3",
"Rev": "6607e7cf50dfc2ef115f5099c6246e3384fbc9a7"
},
{
"ImportPath": "github.com/google/cadvisor/container/common",
"Comment": "v0.23.2",
"Rev": "7ddf6eb5d1f84363fbc181a498313a880b12ba07"
"Comment": "v0.23.3",
"Rev": "6607e7cf50dfc2ef115f5099c6246e3384fbc9a7"
},
{
"ImportPath": "github.com/google/cadvisor/container/docker",
"Comment": "v0.23.2",
"Rev": "7ddf6eb5d1f84363fbc181a498313a880b12ba07"
"Comment": "v0.23.3",
"Rev": "6607e7cf50dfc2ef115f5099c6246e3384fbc9a7"
},
{
"ImportPath": "github.com/google/cadvisor/container/libcontainer",
"Comment": "v0.23.2",
"Rev": "7ddf6eb5d1f84363fbc181a498313a880b12ba07"
"Comment": "v0.23.3",
"Rev": "6607e7cf50dfc2ef115f5099c6246e3384fbc9a7"
},
{
"ImportPath": "github.com/google/cadvisor/container/raw",
"Comment": "v0.23.2",
"Rev": "7ddf6eb5d1f84363fbc181a498313a880b12ba07"
"Comment": "v0.23.3",
"Rev": "6607e7cf50dfc2ef115f5099c6246e3384fbc9a7"
},
{
"ImportPath": "github.com/google/cadvisor/container/rkt",
"Comment": "v0.23.2",
"Rev": "7ddf6eb5d1f84363fbc181a498313a880b12ba07"
"Comment": "v0.23.3",
"Rev": "6607e7cf50dfc2ef115f5099c6246e3384fbc9a7"
},
{
"ImportPath": "github.com/google/cadvisor/container/systemd",
"Comment": "v0.23.2",
"Rev": "7ddf6eb5d1f84363fbc181a498313a880b12ba07"
"Comment": "v0.23.3",
"Rev": "6607e7cf50dfc2ef115f5099c6246e3384fbc9a7"
},
{
"ImportPath": "github.com/google/cadvisor/devicemapper",
"Comment": "v0.23.2",
"Rev": "7ddf6eb5d1f84363fbc181a498313a880b12ba07"
"Comment": "v0.23.3",
"Rev": "6607e7cf50dfc2ef115f5099c6246e3384fbc9a7"
},
{
"ImportPath": "github.com/google/cadvisor/events",
"Comment": "v0.23.2",
"Rev": "7ddf6eb5d1f84363fbc181a498313a880b12ba07"
"Comment": "v0.23.3",
"Rev": "6607e7cf50dfc2ef115f5099c6246e3384fbc9a7"
},
{
"ImportPath": "github.com/google/cadvisor/fs",
"Comment": "v0.23.2",
"Rev": "7ddf6eb5d1f84363fbc181a498313a880b12ba07"
"Comment": "v0.23.3",
"Rev": "6607e7cf50dfc2ef115f5099c6246e3384fbc9a7"
},
{
"ImportPath": "github.com/google/cadvisor/healthz",
"Comment": "v0.23.2",
"Rev": "7ddf6eb5d1f84363fbc181a498313a880b12ba07"
"Comment": "v0.23.3",
"Rev": "6607e7cf50dfc2ef115f5099c6246e3384fbc9a7"
},
{
"ImportPath": "github.com/google/cadvisor/http",
"Comment": "v0.23.2",
"Rev": "7ddf6eb5d1f84363fbc181a498313a880b12ba07"
"Comment": "v0.23.3",
"Rev": "6607e7cf50dfc2ef115f5099c6246e3384fbc9a7"
},
{
"ImportPath": "github.com/google/cadvisor/http/mux",
"Comment": "v0.23.2",
"Rev": "7ddf6eb5d1f84363fbc181a498313a880b12ba07"
"Comment": "v0.23.3",
"Rev": "6607e7cf50dfc2ef115f5099c6246e3384fbc9a7"
},
{
"ImportPath": "github.com/google/cadvisor/info/v1",
"Comment": "v0.23.2",
"Rev": "7ddf6eb5d1f84363fbc181a498313a880b12ba07"
"Comment": "v0.23.3",
"Rev": "6607e7cf50dfc2ef115f5099c6246e3384fbc9a7"
},
{
"ImportPath": "github.com/google/cadvisor/info/v1/test",
"Comment": "v0.23.2",
"Rev": "7ddf6eb5d1f84363fbc181a498313a880b12ba07"
"Comment": "v0.23.3",
"Rev": "6607e7cf50dfc2ef115f5099c6246e3384fbc9a7"
},
{
"ImportPath": "github.com/google/cadvisor/info/v2",
"Comment": "v0.23.2",
"Rev": "7ddf6eb5d1f84363fbc181a498313a880b12ba07"
"Comment": "v0.23.3",
"Rev": "6607e7cf50dfc2ef115f5099c6246e3384fbc9a7"
},
{
"ImportPath": "github.com/google/cadvisor/machine",
"Comment": "v0.23.2",
"Rev": "7ddf6eb5d1f84363fbc181a498313a880b12ba07"
"Comment": "v0.23.3",
"Rev": "6607e7cf50dfc2ef115f5099c6246e3384fbc9a7"
},
{
"ImportPath": "github.com/google/cadvisor/manager",
"Comment": "v0.23.2",
"Rev": "7ddf6eb5d1f84363fbc181a498313a880b12ba07"
"Comment": "v0.23.3",
"Rev": "6607e7cf50dfc2ef115f5099c6246e3384fbc9a7"
},
{
"ImportPath": "github.com/google/cadvisor/manager/watcher",
"Comment": "v0.23.2",
"Rev": "7ddf6eb5d1f84363fbc181a498313a880b12ba07"
"Comment": "v0.23.3",
"Rev": "6607e7cf50dfc2ef115f5099c6246e3384fbc9a7"
},
{
"ImportPath": "github.com/google/cadvisor/manager/watcher/raw",
"Comment": "v0.23.2",
"Rev": "7ddf6eb5d1f84363fbc181a498313a880b12ba07"
"Comment": "v0.23.3",
"Rev": "6607e7cf50dfc2ef115f5099c6246e3384fbc9a7"
},
{
"ImportPath": "github.com/google/cadvisor/manager/watcher/rkt",
"Comment": "v0.23.2",
"Rev": "7ddf6eb5d1f84363fbc181a498313a880b12ba07"
"Comment": "v0.23.3",
"Rev": "6607e7cf50dfc2ef115f5099c6246e3384fbc9a7"
},
{
"ImportPath": "github.com/google/cadvisor/metrics",
"Comment": "v0.23.2",
"Rev": "7ddf6eb5d1f84363fbc181a498313a880b12ba07"
"Comment": "v0.23.3",
"Rev": "6607e7cf50dfc2ef115f5099c6246e3384fbc9a7"
},
{
"ImportPath": "github.com/google/cadvisor/pages",
"Comment": "v0.23.2",
"Rev": "7ddf6eb5d1f84363fbc181a498313a880b12ba07"
"Comment": "v0.23.3",
"Rev": "6607e7cf50dfc2ef115f5099c6246e3384fbc9a7"
},
{
"ImportPath": "github.com/google/cadvisor/pages/static",
"Comment": "v0.23.2",
"Rev": "7ddf6eb5d1f84363fbc181a498313a880b12ba07"
"Comment": "v0.23.3",
"Rev": "6607e7cf50dfc2ef115f5099c6246e3384fbc9a7"
},
{
"ImportPath": "github.com/google/cadvisor/storage",
"Comment": "v0.23.2",
"Rev": "7ddf6eb5d1f84363fbc181a498313a880b12ba07"
"Comment": "v0.23.3",
"Rev": "6607e7cf50dfc2ef115f5099c6246e3384fbc9a7"
},
{
"ImportPath": "github.com/google/cadvisor/summary",
"Comment": "v0.23.2",
"Rev": "7ddf6eb5d1f84363fbc181a498313a880b12ba07"
"Comment": "v0.23.3",
"Rev": "6607e7cf50dfc2ef115f5099c6246e3384fbc9a7"
},
{
"ImportPath": "github.com/google/cadvisor/utils",
"Comment": "v0.23.2",
"Rev": "7ddf6eb5d1f84363fbc181a498313a880b12ba07"
"Comment": "v0.23.3",
"Rev": "6607e7cf50dfc2ef115f5099c6246e3384fbc9a7"
},
{
"ImportPath": "github.com/google/cadvisor/utils/cloudinfo",
"Comment": "v0.23.2",
"Rev": "7ddf6eb5d1f84363fbc181a498313a880b12ba07"
"Comment": "v0.23.3",
"Rev": "6607e7cf50dfc2ef115f5099c6246e3384fbc9a7"
},
{
"ImportPath": "github.com/google/cadvisor/utils/cpuload",
"Comment": "v0.23.2",
"Rev": "7ddf6eb5d1f84363fbc181a498313a880b12ba07"
"Comment": "v0.23.3",
"Rev": "6607e7cf50dfc2ef115f5099c6246e3384fbc9a7"
},
{
"ImportPath": "github.com/google/cadvisor/utils/cpuload/netlink",
"Comment": "v0.23.2",
"Rev": "7ddf6eb5d1f84363fbc181a498313a880b12ba07"
"Comment": "v0.23.3",
"Rev": "6607e7cf50dfc2ef115f5099c6246e3384fbc9a7"
},
{
"ImportPath": "github.com/google/cadvisor/utils/docker",
"Comment": "v0.23.2",
"Rev": "7ddf6eb5d1f84363fbc181a498313a880b12ba07"
"Comment": "v0.23.3",
"Rev": "6607e7cf50dfc2ef115f5099c6246e3384fbc9a7"
},
{
"ImportPath": "github.com/google/cadvisor/utils/oomparser",
"Comment": "v0.23.2",
"Rev": "7ddf6eb5d1f84363fbc181a498313a880b12ba07"
"Comment": "v0.23.3",
"Rev": "6607e7cf50dfc2ef115f5099c6246e3384fbc9a7"
},
{
"ImportPath": "github.com/google/cadvisor/utils/sysfs",
"Comment": "v0.23.2",
"Rev": "7ddf6eb5d1f84363fbc181a498313a880b12ba07"
"Comment": "v0.23.3",
"Rev": "6607e7cf50dfc2ef115f5099c6246e3384fbc9a7"
},
{
"ImportPath": "github.com/google/cadvisor/utils/sysinfo",
"Comment": "v0.23.2",
"Rev": "7ddf6eb5d1f84363fbc181a498313a880b12ba07"
"Comment": "v0.23.3",
"Rev": "6607e7cf50dfc2ef115f5099c6246e3384fbc9a7"
},
{
"ImportPath": "github.com/google/cadvisor/utils/tail",
"Comment": "v0.23.2",
"Rev": "7ddf6eb5d1f84363fbc181a498313a880b12ba07"
"Comment": "v0.23.3",
"Rev": "6607e7cf50dfc2ef115f5099c6246e3384fbc9a7"
},
{
"ImportPath": "github.com/google/cadvisor/validate",
"Comment": "v0.23.2",
"Rev": "7ddf6eb5d1f84363fbc181a498313a880b12ba07"
"Comment": "v0.23.3",
"Rev": "6607e7cf50dfc2ef115f5099c6246e3384fbc9a7"
},
{
"ImportPath": "github.com/google/cadvisor/version",
"Comment": "v0.23.2",
"Rev": "7ddf6eb5d1f84363fbc181a498313a880b12ba07"
"Comment": "v0.23.3",
"Rev": "6607e7cf50dfc2ef115f5099c6246e3384fbc9a7"
},
{
"ImportPath": "github.com/google/gofuzz",

12
vendor/github.com/google/cadvisor/collector/prometheus_collector.go generated vendored
View File

@ -120,12 +120,18 @@ func (collector *PrometheusCollector) GetSpec() []v1.MetricSpec {
}
lines := strings.Split(string(pageContent), "\n")
lineCount := len(lines)
for i, line := range lines {
if strings.HasPrefix(line, "# HELP") {
stopIndex := strings.Index(lines[i+2], "{")
if stopIndex == -1 {
stopIndex = strings.Index(lines[i+2], " ")
if i+2 >= lineCount {
break
}
stopIndex := strings.IndexAny(lines[i+2], "{ ")
if stopIndex == -1 {
continue
}
name := strings.TrimSpace(lines[i+2][0:stopIndex])
if _, ok := collector.metricsSet[name]; collector.metricsSet != nil && !ok {
continue

22
vendor/github.com/google/cadvisor/fs/fs.go generated vendored
View File

@ -44,6 +44,26 @@ const (
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 {
mountpoint string
major uint
@ -391,6 +411,8 @@ func (self *RealFsInfo) GetDirUsage(dir string, timeout time.Duration) (uint64,
if dir == "" {
return 0, fmt.Errorf("invalid directory")
}
claimDuToken()
defer releaseDuToken()
cmd := exec.Command("nice", "-n", "19", "du", "-s", dir)
stdoutp, err := cmd.StdoutPipe()
if err != nil {

2
vendor/github.com/google/cadvisor/version/VERSION generated vendored
View File

@ -1 +1 @@
0.23.2
0.23.3