mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-29 22:46:12 +00:00
Merge pull request #18178 from vishh/cadvisor-trusty-update
Update cadvisor to v0.19.3.1.
This commit is contained in:
Dawn Chen
commit
0bc070eabd
72
Godeps/Godeps.json
generated
72
Godeps/Godeps.json
generated
@ -434,93 +434,93 @@
|
||||
},
|
||||
{
|
||||
"ImportPath": "github.com/google/cadvisor/api",
|
||||
"Comment": "v0.19.2",
|
||||
"Rev": "aa6f80814bc6fdb43a0ed12719658225420ffb7d"
|
||||
"Comment": "v0.19.3-3-g3bfcb1e",
|
||||
"Rev": "3bfcb1e7cfc7de5fe42bba028aaacf2512100cb9"
|
||||
},
|
||||
{
|
||||
"ImportPath": "github.com/google/cadvisor/cache/memory",
|
||||
"Comment": "v0.19.2",
|
||||
"Rev": "aa6f80814bc6fdb43a0ed12719658225420ffb7d"
|
||||
"Comment": "v0.19.3-3-g3bfcb1e",
|
||||
"Rev": "3bfcb1e7cfc7de5fe42bba028aaacf2512100cb9"
|
||||
},
|
||||
{
|
||||
"ImportPath": "github.com/google/cadvisor/collector",
|
||||
"Comment": "v0.19.2",
|
||||
"Rev": "aa6f80814bc6fdb43a0ed12719658225420ffb7d"
|
||||
"Comment": "v0.19.3-3-g3bfcb1e",
|
||||
"Rev": "3bfcb1e7cfc7de5fe42bba028aaacf2512100cb9"
|
||||
},
|
||||
{
|
||||
"ImportPath": "github.com/google/cadvisor/container",
|
||||
"Comment": "v0.19.2",
|
||||
"Rev": "aa6f80814bc6fdb43a0ed12719658225420ffb7d"
|
||||
"Comment": "v0.19.3-3-g3bfcb1e",
|
||||
"Rev": "3bfcb1e7cfc7de5fe42bba028aaacf2512100cb9"
|
||||
},
|
||||
{
|
||||
"ImportPath": "github.com/google/cadvisor/events",
|
||||
"Comment": "v0.19.2",
|
||||
"Rev": "aa6f80814bc6fdb43a0ed12719658225420ffb7d"
|
||||
"Comment": "v0.19.3-3-g3bfcb1e",
|
||||
"Rev": "3bfcb1e7cfc7de5fe42bba028aaacf2512100cb9"
|
||||
},
|
||||
{
|
||||
"ImportPath": "github.com/google/cadvisor/fs",
|
||||
"Comment": "v0.19.2",
|
||||
"Rev": "aa6f80814bc6fdb43a0ed12719658225420ffb7d"
|
||||
"Comment": "v0.19.3-3-g3bfcb1e",
|
||||
"Rev": "3bfcb1e7cfc7de5fe42bba028aaacf2512100cb9"
|
||||
},
|
||||
{
|
||||
"ImportPath": "github.com/google/cadvisor/healthz",
|
||||
"Comment": "v0.19.2",
|
||||
"Rev": "aa6f80814bc6fdb43a0ed12719658225420ffb7d"
|
||||
"Comment": "v0.19.3-3-g3bfcb1e",
|
||||
"Rev": "3bfcb1e7cfc7de5fe42bba028aaacf2512100cb9"
|
||||
},
|
||||
{
|
||||
"ImportPath": "github.com/google/cadvisor/http",
|
||||
"Comment": "v0.19.2",
|
||||
"Rev": "aa6f80814bc6fdb43a0ed12719658225420ffb7d"
|
||||
"Comment": "v0.19.3-3-g3bfcb1e",
|
||||
"Rev": "3bfcb1e7cfc7de5fe42bba028aaacf2512100cb9"
|
||||
},
|
||||
{
|
||||
"ImportPath": "github.com/google/cadvisor/info/v1",
|
||||
"Comment": "v0.19.2",
|
||||
"Rev": "aa6f80814bc6fdb43a0ed12719658225420ffb7d"
|
||||
"Comment": "v0.19.3-3-g3bfcb1e",
|
||||
"Rev": "3bfcb1e7cfc7de5fe42bba028aaacf2512100cb9"
|
||||
},
|
||||
{
|
||||
"ImportPath": "github.com/google/cadvisor/info/v2",
|
||||
"Comment": "v0.19.2",
|
||||
"Rev": "aa6f80814bc6fdb43a0ed12719658225420ffb7d"
|
||||
"Comment": "v0.19.3-3-g3bfcb1e",
|
||||
"Rev": "3bfcb1e7cfc7de5fe42bba028aaacf2512100cb9"
|
||||
},
|
||||
{
|
||||
"ImportPath": "github.com/google/cadvisor/manager",
|
||||
"Comment": "v0.19.2",
|
||||
"Rev": "aa6f80814bc6fdb43a0ed12719658225420ffb7d"
|
||||
"Comment": "v0.19.3-3-g3bfcb1e",
|
||||
"Rev": "3bfcb1e7cfc7de5fe42bba028aaacf2512100cb9"
|
||||
},
|
||||
{
|
||||
"ImportPath": "github.com/google/cadvisor/metrics",
|
||||
"Comment": "v0.19.2",
|
||||
"Rev": "aa6f80814bc6fdb43a0ed12719658225420ffb7d"
|
||||
"Comment": "v0.19.3-3-g3bfcb1e",
|
||||
"Rev": "3bfcb1e7cfc7de5fe42bba028aaacf2512100cb9"
|
||||
},
|
||||
{
|
||||
"ImportPath": "github.com/google/cadvisor/pages",
|
||||
"Comment": "v0.19.2",
|
||||
"Rev": "aa6f80814bc6fdb43a0ed12719658225420ffb7d"
|
||||
"Comment": "v0.19.3-3-g3bfcb1e",
|
||||
"Rev": "3bfcb1e7cfc7de5fe42bba028aaacf2512100cb9"
|
||||
},
|
||||
{
|
||||
"ImportPath": "github.com/google/cadvisor/storage",
|
||||
"Comment": "v0.19.2",
|
||||
"Rev": "aa6f80814bc6fdb43a0ed12719658225420ffb7d"
|
||||
"Comment": "v0.19.3-3-g3bfcb1e",
|
||||
"Rev": "3bfcb1e7cfc7de5fe42bba028aaacf2512100cb9"
|
||||
},
|
||||
{
|
||||
"ImportPath": "github.com/google/cadvisor/summary",
|
||||
"Comment": "v0.19.2",
|
||||
"Rev": "aa6f80814bc6fdb43a0ed12719658225420ffb7d"
|
||||
"Comment": "v0.19.3-3-g3bfcb1e",
|
||||
"Rev": "3bfcb1e7cfc7de5fe42bba028aaacf2512100cb9"
|
||||
},
|
||||
{
|
||||
"ImportPath": "github.com/google/cadvisor/utils",
|
||||
"Comment": "v0.19.2",
|
||||
"Rev": "aa6f80814bc6fdb43a0ed12719658225420ffb7d"
|
||||
"Comment": "v0.19.3-3-g3bfcb1e",
|
||||
"Rev": "3bfcb1e7cfc7de5fe42bba028aaacf2512100cb9"
|
||||
},
|
||||
{
|
||||
"ImportPath": "github.com/google/cadvisor/validate",
|
||||
"Comment": "v0.19.2",
|
||||
"Rev": "aa6f80814bc6fdb43a0ed12719658225420ffb7d"
|
||||
"Comment": "v0.19.3-3-g3bfcb1e",
|
||||
"Rev": "3bfcb1e7cfc7de5fe42bba028aaacf2512100cb9"
|
||||
},
|
||||
{
|
||||
"ImportPath": "github.com/google/cadvisor/version",
|
||||
"Comment": "v0.19.2",
|
||||
"Rev": "aa6f80814bc6fdb43a0ed12719658225420ffb7d"
|
||||
"Comment": "v0.19.3-3-g3bfcb1e",
|
||||
"Rev": "3bfcb1e7cfc7de5fe42bba028aaacf2512100cb9"
|
||||
},
|
||||
{
|
||||
"ImportPath": "github.com/google/gofuzz",
|
||||
|
||||
9
Godeps/_workspace/src/github.com/google/cadvisor/container/docker/factory.go
generated
vendored
9
Godeps/_workspace/src/github.com/google/cadvisor/container/docker/factory.go
generated
vendored
@ -46,6 +46,8 @@ var dockerRunDir = flag.String("docker_run", "/var/run/docker", "Absolute path t
|
||||
// --cgroup-parent have another prefix than 'docker'
|
||||
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.
|
||||
// Directory holding Docker container state information.
|
||||
func DockerStateDir() string {
|
||||
@ -53,13 +55,14 @@ func DockerStateDir() string {
|
||||
}
|
||||
|
||||
// Whether the system is using Systemd.
|
||||
var useSystemd bool
|
||||
var useSystemd = false
|
||||
var check = sync.Once{}
|
||||
|
||||
func UseSystemd() bool {
|
||||
check.Do(func() {
|
||||
useSystemd = false
|
||||
|
||||
if *noSystemd {
|
||||
return
|
||||
}
|
||||
// Check for system.slice in systemd and cpu cgroup.
|
||||
for _, cgroupType := range []string{"name=systemd", "cpu"} {
|
||||
mnt, err := cgroups.FindCgroupMountpoint(cgroupType)
|
||||
|
||||
32
Godeps/_workspace/src/github.com/google/cadvisor/container/libcontainer/helpers.go
generated
vendored
32
Godeps/_workspace/src/github.com/google/cadvisor/container/libcontainer/helpers.go
generated
vendored
@ -18,6 +18,7 @@ import (
|
||||
"bufio"
|
||||
"fmt"
|
||||
"io/ioutil"
|
||||
"os"
|
||||
"path"
|
||||
"regexp"
|
||||
"strconv"
|
||||
@ -135,7 +136,6 @@ func networkStatsFromProc(rootFs string, pid int) ([]info.InterfaceStats, error)
|
||||
|
||||
var (
|
||||
ignoredDevicePrefixes = []string{"lo", "veth", "docker"}
|
||||
netStatLineRE = regexp.MustCompile("[ ]*(.+):([ ]+[0-9]+){16}")
|
||||
)
|
||||
|
||||
func isIgnoredDevice(ifName string) bool {
|
||||
@ -147,6 +147,8 @@ func isIgnoredDevice(ifName string) bool {
|
||||
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) {
|
||||
var (
|
||||
bkt uint64
|
||||
@ -154,34 +156,26 @@ func scanInterfaceStats(netStatsFile string) ([]info.InterfaceStats, error) {
|
||||
|
||||
stats := []info.InterfaceStats{}
|
||||
|
||||
data, err := ioutil.ReadFile(netStatsFile)
|
||||
file, err := os.Open(netStatsFile)
|
||||
if err != nil {
|
||||
return stats, fmt.Errorf("failure opening %s: %v", netStatsFile, err)
|
||||
}
|
||||
defer file.Close()
|
||||
|
||||
reader := strings.NewReader(string(data))
|
||||
scanner := bufio.NewScanner(reader)
|
||||
|
||||
scanner.Split(bufio.ScanLines)
|
||||
scanner := bufio.NewScanner(file)
|
||||
|
||||
for scanner.Scan() {
|
||||
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",
|
||||
&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)
|
||||
_, err := fmt.Sscanf(line, netstatsLine,
|
||||
&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)
|
||||
|
||||
if err != nil {
|
||||
return stats, fmt.Errorf("failure opening %s: %v", netStatsFile, err)
|
||||
}
|
||||
|
||||
if !isIgnoredDevice(i.Name) {
|
||||
stats = append(stats, i)
|
||||
}
|
||||
if err == nil && !isIgnoredDevice(i.Name) {
|
||||
stats = append(stats, i)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
2
Godeps/_workspace/src/github.com/google/cadvisor/version/VERSION
generated
vendored
2
Godeps/_workspace/src/github.com/google/cadvisor/version/VERSION
generated
vendored
@ -1 +1 @@
|
||||
0.19.2
|
||||
0.19.3.1
|
||||
|
||||
Loading…
Reference in New Issue
Block a user