github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-01 07:47:56 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #18178 from vishh/cadvisor-trusty-update

Browse Source 
Update cadvisor to v0.19.3.1.
This commit is contained in:
Dawn Chen 2015-12-04 09:11:08 -08:00
commit 0bc070eabd
4 changed files with 56 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
Godeps/Godeps.json generated
View File

@ -434,93 +434,93 @@
}, },
{ {
"ImportPath": "github.com/google/cadvisor/api", "ImportPath": "github.com/google/cadvisor/api",
"Comment": "v0.19.2", "Comment": "v0.19.3-3-g3bfcb1e",
"Rev": "aa6f80814bc6fdb43a0ed12719658225420ffb7d" "Rev": "3bfcb1e7cfc7de5fe42bba028aaacf2512100cb9"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/cache/memory", "ImportPath": "github.com/google/cadvisor/cache/memory",
"Comment": "v0.19.2", "Comment": "v0.19.3-3-g3bfcb1e",
"Rev": "aa6f80814bc6fdb43a0ed12719658225420ffb7d" "Rev": "3bfcb1e7cfc7de5fe42bba028aaacf2512100cb9"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/collector", "ImportPath": "github.com/google/cadvisor/collector",
"Comment": "v0.19.2", "Comment": "v0.19.3-3-g3bfcb1e",
"Rev": "aa6f80814bc6fdb43a0ed12719658225420ffb7d" "Rev": "3bfcb1e7cfc7de5fe42bba028aaacf2512100cb9"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/container", "ImportPath": "github.com/google/cadvisor/container",
"Comment": "v0.19.2", "Comment": "v0.19.3-3-g3bfcb1e",
"Rev": "aa6f80814bc6fdb43a0ed12719658225420ffb7d" "Rev": "3bfcb1e7cfc7de5fe42bba028aaacf2512100cb9"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/events", "ImportPath": "github.com/google/cadvisor/events",
"Comment": "v0.19.2", "Comment": "v0.19.3-3-g3bfcb1e",
"Rev": "aa6f80814bc6fdb43a0ed12719658225420ffb7d" "Rev": "3bfcb1e7cfc7de5fe42bba028aaacf2512100cb9"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/fs", "ImportPath": "github.com/google/cadvisor/fs",
"Comment": "v0.19.2", "Comment": "v0.19.3-3-g3bfcb1e",
"Rev": "aa6f80814bc6fdb43a0ed12719658225420ffb7d" "Rev": "3bfcb1e7cfc7de5fe42bba028aaacf2512100cb9"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/healthz", "ImportPath": "github.com/google/cadvisor/healthz",
"Comment": "v0.19.2", "Comment": "v0.19.3-3-g3bfcb1e",
"Rev": "aa6f80814bc6fdb43a0ed12719658225420ffb7d" "Rev": "3bfcb1e7cfc7de5fe42bba028aaacf2512100cb9"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/http", "ImportPath": "github.com/google/cadvisor/http",
"Comment": "v0.19.2", "Comment": "v0.19.3-3-g3bfcb1e",
"Rev": "aa6f80814bc6fdb43a0ed12719658225420ffb7d" "Rev": "3bfcb1e7cfc7de5fe42bba028aaacf2512100cb9"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/info/v1", "ImportPath": "github.com/google/cadvisor/info/v1",
"Comment": "v0.19.2", "Comment": "v0.19.3-3-g3bfcb1e",
"Rev": "aa6f80814bc6fdb43a0ed12719658225420ffb7d" "Rev": "3bfcb1e7cfc7de5fe42bba028aaacf2512100cb9"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/info/v2", "ImportPath": "github.com/google/cadvisor/info/v2",
"Comment": "v0.19.2", "Comment": "v0.19.3-3-g3bfcb1e",
"Rev": "aa6f80814bc6fdb43a0ed12719658225420ffb7d" "Rev": "3bfcb1e7cfc7de5fe42bba028aaacf2512100cb9"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/manager", "ImportPath": "github.com/google/cadvisor/manager",
"Comment": "v0.19.2", "Comment": "v0.19.3-3-g3bfcb1e",
"Rev": "aa6f80814bc6fdb43a0ed12719658225420ffb7d" "Rev": "3bfcb1e7cfc7de5fe42bba028aaacf2512100cb9"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/metrics", "ImportPath": "github.com/google/cadvisor/metrics",
"Comment": "v0.19.2", "Comment": "v0.19.3-3-g3bfcb1e",
"Rev": "aa6f80814bc6fdb43a0ed12719658225420ffb7d" "Rev": "3bfcb1e7cfc7de5fe42bba028aaacf2512100cb9"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/pages", "ImportPath": "github.com/google/cadvisor/pages",
"Comment": "v0.19.2", "Comment": "v0.19.3-3-g3bfcb1e",
"Rev": "aa6f80814bc6fdb43a0ed12719658225420ffb7d" "Rev": "3bfcb1e7cfc7de5fe42bba028aaacf2512100cb9"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/storage", "ImportPath": "github.com/google/cadvisor/storage",
"Comment": "v0.19.2", "Comment": "v0.19.3-3-g3bfcb1e",
"Rev": "aa6f80814bc6fdb43a0ed12719658225420ffb7d" "Rev": "3bfcb1e7cfc7de5fe42bba028aaacf2512100cb9"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/summary", "ImportPath": "github.com/google/cadvisor/summary",
"Comment": "v0.19.2", "Comment": "v0.19.3-3-g3bfcb1e",
"Rev": "aa6f80814bc6fdb43a0ed12719658225420ffb7d" "Rev": "3bfcb1e7cfc7de5fe42bba028aaacf2512100cb9"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/utils", "ImportPath": "github.com/google/cadvisor/utils",
"Comment": "v0.19.2", "Comment": "v0.19.3-3-g3bfcb1e",
"Rev": "aa6f80814bc6fdb43a0ed12719658225420ffb7d" "Rev": "3bfcb1e7cfc7de5fe42bba028aaacf2512100cb9"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/validate", "ImportPath": "github.com/google/cadvisor/validate",
"Comment": "v0.19.2", "Comment": "v0.19.3-3-g3bfcb1e",
"Rev": "aa6f80814bc6fdb43a0ed12719658225420ffb7d" "Rev": "3bfcb1e7cfc7de5fe42bba028aaacf2512100cb9"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/version", "ImportPath": "github.com/google/cadvisor/version",
"Comment": "v0.19.2", "Comment": "v0.19.3-3-g3bfcb1e",
"Rev": "aa6f80814bc6fdb43a0ed12719658225420ffb7d" "Rev": "3bfcb1e7cfc7de5fe42bba028aaacf2512100cb9"
}, },
{ {
"ImportPath": "github.com/google/gofuzz", "ImportPath": "github.com/google/gofuzz",

9
Godeps/_workspace/src/github.com/google/cadvisor/container/docker/factory.go generated vendored
View File

@ -46,6 +46,8 @@ var dockerRunDir = flag.String("docker_run", "/var/run/docker", "Absolute path t
// --cgroup-parent have another prefix than 'docker' // --cgroup-parent have another prefix than 'docker'
var dockerCgroupRegexp = regexp.MustCompile(`.+-([a-z0-9]{64})\.scope$`) var dockerCgroupRegexp = regexp.MustCompile(`.+-([a-z0-9]{64})\.scope$`)
var noSystemd = flag.Bool("nosystemd", false, "Explicitly disable systemd support for Docker containers")
// TODO(vmarmol): Export run dir too for newer Dockers. // TODO(vmarmol): Export run dir too for newer Dockers.
// Directory holding Docker container state information. // Directory holding Docker container state information.
func DockerStateDir() string { func DockerStateDir() string {
@ -53,13 +55,14 @@ func DockerStateDir() string {
} }
// Whether the system is using Systemd. // Whether the system is using Systemd.
var useSystemd bool var useSystemd = false
var check = sync.Once{} var check = sync.Once{}
func UseSystemd() bool { func UseSystemd() bool {
check.Do(func() { check.Do(func() {
useSystemd = false if *noSystemd {
return
}
// Check for system.slice in systemd and cpu cgroup. // Check for system.slice in systemd and cpu cgroup.
for _, cgroupType := range []string{"name=systemd", "cpu"} { for _, cgroupType := range []string{"name=systemd", "cpu"} {
mnt, err := cgroups.FindCgroupMountpoint(cgroupType) mnt, err := cgroups.FindCgroupMountpoint(cgroupType)

32
Godeps/_workspace/src/github.com/google/cadvisor/container/libcontainer/helpers.go generated vendored
View File

@ -18,6 +18,7 @@ import (
"bufio" "bufio"
"fmt" "fmt"
"io/ioutil" "io/ioutil"
"os"
"path" "path"
"regexp" "regexp"
"strconv" "strconv"
@ -135,7 +136,6 @@ func networkStatsFromProc(rootFs string, pid int) ([]info.InterfaceStats, error)
var ( var (
ignoredDevicePrefixes = []string{"lo", "veth", "docker"} ignoredDevicePrefixes = []string{"lo", "veth", "docker"}
netStatLineRE = regexp.MustCompile("[ ]*(.+):([ ]+[0-9]+){16}")
) )
func isIgnoredDevice(ifName string) bool { func isIgnoredDevice(ifName string) bool {
@ -147,6 +147,8 @@ func isIgnoredDevice(ifName string) bool {
return false return false
} }
const netstatsLine = `%s %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d`
func scanInterfaceStats(netStatsFile string) ([]info.InterfaceStats, error) { func scanInterfaceStats(netStatsFile string) ([]info.InterfaceStats, error) {
var ( var (
bkt uint64 bkt uint64
@ -154,34 +156,26 @@ func scanInterfaceStats(netStatsFile string) ([]info.InterfaceStats, error) {
stats := []info.InterfaceStats{} stats := []info.InterfaceStats{}
data, err := ioutil.ReadFile(netStatsFile) file, err := os.Open(netStatsFile)
if err != nil { if err != nil {
return stats, fmt.Errorf("failure opening %s: %v", netStatsFile, err) return stats, fmt.Errorf("failure opening %s: %v", netStatsFile, err)
} }
defer file.Close()
reader := strings.NewReader(string(data)) scanner := bufio.NewScanner(file)
scanner := bufio.NewScanner(reader)
scanner.Split(bufio.ScanLines)
for scanner.Scan() { for scanner.Scan() {
line := scanner.Text() line := scanner.Text()
if netStatLineRE.MatchString(line) { line = strings.Replace(line, ":", "", -1)
line = strings.Replace(line, ":", "", -1)
i := info.InterfaceStats{} i := info.InterfaceStats{}
_, err := fmt.Sscanf(line, "%s %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d", _, err := fmt.Sscanf(line, netstatsLine,
&i.Name, &i.RxBytes, &i.RxPackets, &i.RxErrors, &i.RxDropped, &bkt, &bkt, &bkt, &i.Name, &i.RxBytes, &i.RxPackets, &i.RxErrors, &i.RxDropped, &bkt, &bkt, &bkt,
&bkt, &i.TxBytes, &i.TxPackets, &i.TxErrors, &i.TxDropped, &bkt, &bkt, &bkt, &bkt) &bkt, &i.TxBytes, &i.TxPackets, &i.TxErrors, &i.TxDropped, &bkt, &bkt, &bkt, &bkt)
if err != nil { if err == nil && !isIgnoredDevice(i.Name) {
return stats, fmt.Errorf("failure opening %s: %v", netStatsFile, err) stats = append(stats, i)
}
if !isIgnoredDevice(i.Name) {
stats = append(stats, i)
}
} }
} }

2
Godeps/_workspace/src/github.com/google/cadvisor/version/VERSION generated vendored
View File

@ -1 +1 @@
0.19.2 0.19.3.1