Skip to content

K
k3s
Commit fa71aac0 authored by Seth Jennings's avatar Seth Jennings
Browse files
Options

bump(github.com/google/cadvisor): 27e1acbb4ef0fe1889208b21f8f4a6d0863e02f6

parent 89cd583e
Expand all Show whitespace changes
Inline Side-by-side
Showing with 335 additions and 158 deletions
Godeps/Godeps.json
View file @ fa71aac0
...@@ -1336,208 +1336,208 @@ ...@@ -1336,208 +1336,208 @@
}, },
{ {
"ImportPath": "github.com/google/cadvisor/api", "ImportPath": "github.com/google/cadvisor/api",
"Comment": "v0.26.1", "Comment": "v0.26.0-37-g27e1acb",
"Rev": "d19cc94b760cd8f150a0a5d95b404dec39a121a1" "Rev": "27e1acbb4ef0fe1889208b21f8f4a6d0863e02f6"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/cache/memory", "ImportPath": "github.com/google/cadvisor/cache/memory",
"Comment": "v0.26.1", "Comment": "v0.26.0-37-g27e1acb",
"Rev": "d19cc94b760cd8f150a0a5d95b404dec39a121a1" "Rev": "27e1acbb4ef0fe1889208b21f8f4a6d0863e02f6"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/client/v2", "ImportPath": "github.com/google/cadvisor/client/v2",
"Comment": "v0.26.1", "Comment": "v0.26.0-37-g27e1acb",
"Rev": "d19cc94b760cd8f150a0a5d95b404dec39a121a1" "Rev": "27e1acbb4ef0fe1889208b21f8f4a6d0863e02f6"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/collector", "ImportPath": "github.com/google/cadvisor/collector",
"Comment": "v0.26.1", "Comment": "v0.26.0-37-g27e1acb",
"Rev": "d19cc94b760cd8f150a0a5d95b404dec39a121a1" "Rev": "27e1acbb4ef0fe1889208b21f8f4a6d0863e02f6"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/container", "ImportPath": "github.com/google/cadvisor/container",
"Comment": "v0.26.1", "Comment": "v0.26.0-37-g27e1acb",
"Rev": "d19cc94b760cd8f150a0a5d95b404dec39a121a1" "Rev": "27e1acbb4ef0fe1889208b21f8f4a6d0863e02f6"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/container/common", "ImportPath": "github.com/google/cadvisor/container/common",
"Comment": "v0.26.1", "Comment": "v0.26.0-37-g27e1acb",
"Rev": "d19cc94b760cd8f150a0a5d95b404dec39a121a1" "Rev": "27e1acbb4ef0fe1889208b21f8f4a6d0863e02f6"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/container/docker", "ImportPath": "github.com/google/cadvisor/container/docker",
"Comment": "v0.26.1", "Comment": "v0.26.0-37-g27e1acb",
"Rev": "d19cc94b760cd8f150a0a5d95b404dec39a121a1" "Rev": "27e1acbb4ef0fe1889208b21f8f4a6d0863e02f6"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/container/libcontainer", "ImportPath": "github.com/google/cadvisor/container/libcontainer",
"Comment": "v0.26.1", "Comment": "v0.26.0-37-g27e1acb",
"Rev": "d19cc94b760cd8f150a0a5d95b404dec39a121a1" "Rev": "27e1acbb4ef0fe1889208b21f8f4a6d0863e02f6"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/container/raw", "ImportPath": "github.com/google/cadvisor/container/raw",
"Comment": "v0.26.1", "Comment": "v0.26.0-37-g27e1acb",
"Rev": "d19cc94b760cd8f150a0a5d95b404dec39a121a1" "Rev": "27e1acbb4ef0fe1889208b21f8f4a6d0863e02f6"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/container/rkt", "ImportPath": "github.com/google/cadvisor/container/rkt",
"Comment": "v0.26.1", "Comment": "v0.26.0-37-g27e1acb",
"Rev": "d19cc94b760cd8f150a0a5d95b404dec39a121a1" "Rev": "27e1acbb4ef0fe1889208b21f8f4a6d0863e02f6"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/container/systemd", "ImportPath": "github.com/google/cadvisor/container/systemd",
"Comment": "v0.26.1", "Comment": "v0.26.0-37-g27e1acb",
"Rev": "d19cc94b760cd8f150a0a5d95b404dec39a121a1" "Rev": "27e1acbb4ef0fe1889208b21f8f4a6d0863e02f6"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/devicemapper", "ImportPath": "github.com/google/cadvisor/devicemapper",
"Comment": "v0.26.1", "Comment": "v0.26.0-37-g27e1acb",
"Rev": "d19cc94b760cd8f150a0a5d95b404dec39a121a1" "Rev": "27e1acbb4ef0fe1889208b21f8f4a6d0863e02f6"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/events", "ImportPath": "github.com/google/cadvisor/events",
"Comment": "v0.26.1", "Comment": "v0.26.0-37-g27e1acb",
"Rev": "d19cc94b760cd8f150a0a5d95b404dec39a121a1" "Rev": "27e1acbb4ef0fe1889208b21f8f4a6d0863e02f6"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/fs", "ImportPath": "github.com/google/cadvisor/fs",
"Comment": "v0.26.1", "Comment": "v0.26.0-37-g27e1acb",
"Rev": "d19cc94b760cd8f150a0a5d95b404dec39a121a1" "Rev": "27e1acbb4ef0fe1889208b21f8f4a6d0863e02f6"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/healthz", "ImportPath": "github.com/google/cadvisor/healthz",
"Comment": "v0.26.1", "Comment": "v0.26.0-37-g27e1acb",
"Rev": "d19cc94b760cd8f150a0a5d95b404dec39a121a1" "Rev": "27e1acbb4ef0fe1889208b21f8f4a6d0863e02f6"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/http", "ImportPath": "github.com/google/cadvisor/http",
"Comment": "v0.26.1", "Comment": "v0.26.0-37-g27e1acb",
"Rev": "d19cc94b760cd8f150a0a5d95b404dec39a121a1" "Rev": "27e1acbb4ef0fe1889208b21f8f4a6d0863e02f6"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/http/mux", "ImportPath": "github.com/google/cadvisor/http/mux",
"Comment": "v0.26.1", "Comment": "v0.26.0-37-g27e1acb",
"Rev": "d19cc94b760cd8f150a0a5d95b404dec39a121a1" "Rev": "27e1acbb4ef0fe1889208b21f8f4a6d0863e02f6"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/info/v1", "ImportPath": "github.com/google/cadvisor/info/v1",
"Comment": "v0.26.1", "Comment": "v0.26.0-37-g27e1acb",
"Rev": "d19cc94b760cd8f150a0a5d95b404dec39a121a1" "Rev": "27e1acbb4ef0fe1889208b21f8f4a6d0863e02f6"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/info/v2", "ImportPath": "github.com/google/cadvisor/info/v2",
"Comment": "v0.26.1", "Comment": "v0.26.0-37-g27e1acb",
"Rev": "d19cc94b760cd8f150a0a5d95b404dec39a121a1" "Rev": "27e1acbb4ef0fe1889208b21f8f4a6d0863e02f6"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/machine", "ImportPath": "github.com/google/cadvisor/machine",
"Comment": "v0.26.1", "Comment": "v0.26.0-37-g27e1acb",
"Rev": "d19cc94b760cd8f150a0a5d95b404dec39a121a1" "Rev": "27e1acbb4ef0fe1889208b21f8f4a6d0863e02f6"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/manager", "ImportPath": "github.com/google/cadvisor/manager",
"Comment": "v0.26.1", "Comment": "v0.26.0-37-g27e1acb",
"Rev": "d19cc94b760cd8f150a0a5d95b404dec39a121a1" "Rev": "27e1acbb4ef0fe1889208b21f8f4a6d0863e02f6"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/manager/watcher", "ImportPath": "github.com/google/cadvisor/manager/watcher",
"Comment": "v0.26.1", "Comment": "v0.26.0-37-g27e1acb",
"Rev": "d19cc94b760cd8f150a0a5d95b404dec39a121a1" "Rev": "27e1acbb4ef0fe1889208b21f8f4a6d0863e02f6"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/manager/watcher/raw", "ImportPath": "github.com/google/cadvisor/manager/watcher/raw",
"Comment": "v0.26.1", "Comment": "v0.26.0-37-g27e1acb",
"Rev": "d19cc94b760cd8f150a0a5d95b404dec39a121a1" "Rev": "27e1acbb4ef0fe1889208b21f8f4a6d0863e02f6"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/manager/watcher/rkt", "ImportPath": "github.com/google/cadvisor/manager/watcher/rkt",
"Comment": "v0.26.1", "Comment": "v0.26.0-37-g27e1acb",
"Rev": "d19cc94b760cd8f150a0a5d95b404dec39a121a1" "Rev": "27e1acbb4ef0fe1889208b21f8f4a6d0863e02f6"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/metrics", "ImportPath": "github.com/google/cadvisor/metrics",
"Comment": "v0.26.1", "Comment": "v0.26.0-37-g27e1acb",
"Rev": "d19cc94b760cd8f150a0a5d95b404dec39a121a1" "Rev": "27e1acbb4ef0fe1889208b21f8f4a6d0863e02f6"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/pages", "ImportPath": "github.com/google/cadvisor/pages",
"Comment": "v0.26.1", "Comment": "v0.26.0-37-g27e1acb",
"Rev": "d19cc94b760cd8f150a0a5d95b404dec39a121a1" "Rev": "27e1acbb4ef0fe1889208b21f8f4a6d0863e02f6"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/pages/static", "ImportPath": "github.com/google/cadvisor/pages/static",
"Comment": "v0.26.1", "Comment": "v0.26.0-37-g27e1acb",
"Rev": "d19cc94b760cd8f150a0a5d95b404dec39a121a1" "Rev": "27e1acbb4ef0fe1889208b21f8f4a6d0863e02f6"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/storage", "ImportPath": "github.com/google/cadvisor/storage",
"Comment": "v0.26.1", "Comment": "v0.26.0-37-g27e1acb",
"Rev": "d19cc94b760cd8f150a0a5d95b404dec39a121a1" "Rev": "27e1acbb4ef0fe1889208b21f8f4a6d0863e02f6"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/summary", "ImportPath": "github.com/google/cadvisor/summary",
"Comment": "v0.26.1", "Comment": "v0.26.0-37-g27e1acb",
"Rev": "d19cc94b760cd8f150a0a5d95b404dec39a121a1" "Rev": "27e1acbb4ef0fe1889208b21f8f4a6d0863e02f6"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/utils", "ImportPath": "github.com/google/cadvisor/utils",
"Comment": "v0.26.1", "Comment": "v0.26.0-37-g27e1acb",
"Rev": "d19cc94b760cd8f150a0a5d95b404dec39a121a1" "Rev": "27e1acbb4ef0fe1889208b21f8f4a6d0863e02f6"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/utils/cloudinfo", "ImportPath": "github.com/google/cadvisor/utils/cloudinfo",
"Comment": "v0.26.1", "Comment": "v0.26.0-37-g27e1acb",
"Rev": "d19cc94b760cd8f150a0a5d95b404dec39a121a1" "Rev": "27e1acbb4ef0fe1889208b21f8f4a6d0863e02f6"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/utils/cpuload", "ImportPath": "github.com/google/cadvisor/utils/cpuload",
"Comment": "v0.26.1", "Comment": "v0.26.0-37-g27e1acb",
"Rev": "d19cc94b760cd8f150a0a5d95b404dec39a121a1" "Rev": "27e1acbb4ef0fe1889208b21f8f4a6d0863e02f6"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/utils/cpuload/netlink", "ImportPath": "github.com/google/cadvisor/utils/cpuload/netlink",
"Comment": "v0.26.1", "Comment": "v0.26.0-37-g27e1acb",
"Rev": "d19cc94b760cd8f150a0a5d95b404dec39a121a1" "Rev": "27e1acbb4ef0fe1889208b21f8f4a6d0863e02f6"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/utils/docker", "ImportPath": "github.com/google/cadvisor/utils/docker",
"Comment": "v0.26.1", "Comment": "v0.26.0-37-g27e1acb",
"Rev": "d19cc94b760cd8f150a0a5d95b404dec39a121a1" "Rev": "27e1acbb4ef0fe1889208b21f8f4a6d0863e02f6"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/utils/oomparser", "ImportPath": "github.com/google/cadvisor/utils/oomparser",
"Comment": "v0.26.1", "Comment": "v0.26.0-37-g27e1acb",
"Rev": "d19cc94b760cd8f150a0a5d95b404dec39a121a1" "Rev": "27e1acbb4ef0fe1889208b21f8f4a6d0863e02f6"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/utils/sysfs", "ImportPath": "github.com/google/cadvisor/utils/sysfs",
"Comment": "v0.26.1", "Comment": "v0.26.0-37-g27e1acb",
"Rev": "d19cc94b760cd8f150a0a5d95b404dec39a121a1" "Rev": "27e1acbb4ef0fe1889208b21f8f4a6d0863e02f6"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/utils/sysinfo", "ImportPath": "github.com/google/cadvisor/utils/sysinfo",
"Comment": "v0.26.1", "Comment": "v0.26.0-37-g27e1acb",
"Rev": "d19cc94b760cd8f150a0a5d95b404dec39a121a1" "Rev": "27e1acbb4ef0fe1889208b21f8f4a6d0863e02f6"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/utils/tail", "ImportPath": "github.com/google/cadvisor/utils/tail",
"Comment": "v0.26.1", "Comment": "v0.26.0-37-g27e1acb",
"Rev": "d19cc94b760cd8f150a0a5d95b404dec39a121a1" "Rev": "27e1acbb4ef0fe1889208b21f8f4a6d0863e02f6"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/validate", "ImportPath": "github.com/google/cadvisor/validate",
"Comment": "v0.26.1", "Comment": "v0.26.0-37-g27e1acb",
"Rev": "d19cc94b760cd8f150a0a5d95b404dec39a121a1" "Rev": "27e1acbb4ef0fe1889208b21f8f4a6d0863e02f6"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/version", "ImportPath": "github.com/google/cadvisor/version",
"Comment": "v0.26.1", "Comment": "v0.26.0-37-g27e1acb",
"Rev": "d19cc94b760cd8f150a0a5d95b404dec39a121a1" "Rev": "27e1acbb4ef0fe1889208b21f8f4a6d0863e02f6"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/zfs", "ImportPath": "github.com/google/cadvisor/zfs",
"Comment": "v0.26.1", "Comment": "v0.26.0-37-g27e1acb",
"Rev": "d19cc94b760cd8f150a0a5d95b404dec39a121a1" "Rev": "27e1acbb4ef0fe1889208b21f8f4a6d0863e02f6"
}, },
{ {
"ImportPath": "github.com/google/certificate-transparency/go", "ImportPath": "github.com/google/certificate-transparency/go",
......
vendor/github.com/google/cadvisor/api/handler.go
View file @ fa71aac0
...@@ -85,7 +85,7 @@ func handleRequest(supportedApiVersions map[string]ApiVersion, m manager.Manager ...@@ -85,7 +85,7 @@ func handleRequest(supportedApiVersions map[string]ApiVersion, m manager.Manager
versions = append(versions, v) versions = append(versions, v)
} }
sort.Strings(versions) sort.Strings(versions)
fmt.Fprintf(w, "Supported API versions: %s", strings.Join(versions, ",")) http.Error(w, fmt.Sprintf("Supported API versions: %s", strings.Join(versions, ",")), http.StatusBadRequest)
return nil return nil
} }
...@@ -109,7 +109,7 @@ func handleRequest(supportedApiVersions map[string]ApiVersion, m manager.Manager ...@@ -109,7 +109,7 @@ func handleRequest(supportedApiVersions map[string]ApiVersion, m manager.Manager
if requestType == "" { if requestType == "" {
requestTypes := versionHandler.SupportedRequestTypes() requestTypes := versionHandler.SupportedRequestTypes()
sort.Strings(requestTypes) sort.Strings(requestTypes)
fmt.Fprintf(w, "Supported request types: %q", strings.Join(requestTypes, ",")) http.Error(w, fmt.Sprintf("Supported request types: %q", strings.Join(requestTypes, ",")), http.StatusBadRequest)
return nil return nil
} }
......
vendor/github.com/google/cadvisor/container/common/helpers.go
View file @ fa71aac0
...@@ -127,15 +127,13 @@ func GetSpec(cgroupPaths map[string]string, machineInfoFactory info.MachineInfoF ...@@ -127,15 +127,13 @@ func GetSpec(cgroupPaths map[string]string, machineInfoFactory info.MachineInfoF
func readString(dirpath string, file string) string { func readString(dirpath string, file string) string {
cgroupFile := path.Join(dirpath, file) cgroupFile := path.Join(dirpath, file)
// Ignore non-existent files
if !utils.FileExists(cgroupFile) {
return ""
}
// Read // Read
out, err := ioutil.ReadFile(cgroupFile) out, err := ioutil.ReadFile(cgroupFile)
if err != nil { if err != nil {
// Ignore non-existent files
if !os.IsNotExist(err) {
glog.Errorf("readString: Failed to read %q: %s", cgroupFile, err) glog.Errorf("readString: Failed to read %q: %s", cgroupFile, err)
}
return "" return ""
} }
return strings.TrimSpace(string(out)) return strings.TrimSpace(string(out))
...@@ -158,13 +156,12 @@ func readUInt64(dirpath string, file string) uint64 { ...@@ -158,13 +156,12 @@ func readUInt64(dirpath string, file string) uint64 {
// Lists all directories under "path" and outputs the results as children of "parent". // Lists all directories under "path" and outputs the results as children of "parent".
func ListDirectories(dirpath string, parent string, recursive bool, output map[string]struct{}) error { func ListDirectories(dirpath string, parent string, recursive bool, output map[string]struct{}) error {
// Ignore if this hierarchy does not exist.
if !utils.FileExists(dirpath) {
return nil
}
entries, err := ioutil.ReadDir(dirpath) entries, err := ioutil.ReadDir(dirpath)
if err != nil { if err != nil {
// Ignore if this hierarchy does not exist.
if os.IsNotExist(err) {
err = nil
}
return err return err
} }
for _, entry := range entries { for _, entry := range entries {
......
vendor/github.com/google/cadvisor/devicemapper/thin_ls_client.go
View file @ fa71aac0
...@@ -80,7 +80,7 @@ func parseThinLsOutput(output []byte) map[string]uint64 { ...@@ -80,7 +80,7 @@ func parseThinLsOutput(output []byte) map[string]uint64 {
deviceID := fields[0] deviceID := fields[0]
usage, err := strconv.ParseUint(fields[1], 10, 64) usage, err := strconv.ParseUint(fields[1], 10, 64)
if err != nil { if err != nil {
glog.Warning("unexpected error parsing thin_ls output: %v", err) glog.Warningf("unexpected error parsing thin_ls output: %v", err)
continue continue
} }
......
vendor/github.com/google/cadvisor/fs/fs.go
View file @ fa71aac0
...@@ -79,6 +79,8 @@ type RealFsInfo struct { ...@@ -79,6 +79,8 @@ type RealFsInfo struct {
// Map from label to block device path. // Map from label to block device path.
// Labels are intent-specific tags that are auto-detected. // Labels are intent-specific tags that are auto-detected.
labels map[string]string labels map[string]string
// Map from mountpoint to mount information.
mounts map[string]*mount.Info
// devicemapper client // devicemapper client
dmsetup devicemapper.DmsetupClient dmsetup devicemapper.DmsetupClient
} }
...@@ -106,9 +108,14 @@ func NewFsInfo(context Context) (FsInfo, error) { ...@@ -106,9 +108,14 @@ func NewFsInfo(context Context) (FsInfo, error) {
fsInfo := &RealFsInfo{ fsInfo := &RealFsInfo{
partitions: processMounts(mounts, excluded), partitions: processMounts(mounts, excluded),
labels: make(map[string]string, 0), labels: make(map[string]string, 0),
mounts: make(map[string]*mount.Info, 0),
dmsetup: devicemapper.NewDmsetupClient(), dmsetup: devicemapper.NewDmsetupClient(),
} }
for _, mount := range mounts {
fsInfo.mounts[mount.Mountpoint] = mount
}
fsInfo.addRktImagesLabel(context, mounts) fsInfo.addRktImagesLabel(context, mounts)
// need to call this before the log line below printing out the partitions, as this function may // need to call this before the log line below printing out the partitions, as this function may
// add a "partition" for devicemapper to fsInfo.partitions // add a "partition" for devicemapper to fsInfo.partitions
...@@ -125,6 +132,7 @@ func processMounts(mounts []*mount.Info, excludedMountpointPrefixes []string) ma ...@@ -125,6 +132,7 @@ func processMounts(mounts []*mount.Info, excludedMountpointPrefixes []string) ma
supportedFsType := map[string]bool{ supportedFsType := map[string]bool{
// all ext systems are checked through prefix. // all ext systems are checked through prefix.
"btrfs": true, "btrfs": true,
"tmpfs": true,
"xfs": true, "xfs": true,
"zfs": true, "zfs": true,
} }
...@@ -152,25 +160,12 @@ func processMounts(mounts []*mount.Info, excludedMountpointPrefixes []string) ma ...@@ -152,25 +160,12 @@ func processMounts(mounts []*mount.Info, excludedMountpointPrefixes []string) ma
// btrfs fix: following workaround fixes wrong btrfs Major and Minor Ids reported in /proc/self/mountinfo. // btrfs fix: following workaround fixes wrong btrfs Major and Minor Ids reported in /proc/self/mountinfo.
// instead of using values from /proc/self/mountinfo we use stat to get Ids from btrfs mount point // instead of using values from /proc/self/mountinfo we use stat to get Ids from btrfs mount point
if mount.Fstype == "btrfs" && mount.Major == 0 && strings.HasPrefix(mount.Source, "/dev/") { if mount.Fstype == "btrfs" && mount.Major == 0 && strings.HasPrefix(mount.Source, "/dev/") {
major, minor, err := getBtrfsMajorMinorIds(mount)
buf := new(syscall.Stat_t)
err := syscall.Stat(mount.Source, buf)
if err != nil { if err != nil {
glog.Warningf("stat failed on %s with error: %s", mount.Source, err) glog.Warningf("%s", err)
} else { } else {
glog.Infof("btrfs mount %#v", mount) mount.Major = major
if buf.Mode&syscall.S_IFMT == syscall.S_IFBLK { mount.Minor = minor
err := syscall.Stat(mount.Mountpoint, buf)
if err != nil {
glog.Warningf("stat failed on %s with error: %s", mount.Mountpoint, err)
} else {
glog.Infof("btrfs dev major:minor %d:%d\n", int(major(buf.Dev)), int(minor(buf.Dev)))
glog.Infof("btrfs rdev major:minor %d:%d\n", int(major(buf.Rdev)), int(minor(buf.Rdev)))
mount.Major = int(major(buf.Dev))
mount.Minor = int(minor(buf.Dev))
}
}
} }
} }
...@@ -444,6 +439,7 @@ func (self *RealFsInfo) GetDirFsDevice(dir string) (*DeviceInfo, error) { ...@@ -444,6 +439,7 @@ func (self *RealFsInfo) GetDirFsDevice(dir string) (*DeviceInfo, error) {
if err != nil { if err != nil {
return nil, fmt.Errorf("stat failed on %s with error: %s", dir, err) return nil, fmt.Errorf("stat failed on %s with error: %s", dir, err)
} }
major := major(buf.Dev) major := major(buf.Dev)
minor := minor(buf.Dev) minor := minor(buf.Dev)
for device, partition := range self.partitions { for device, partition := range self.partitions {
...@@ -451,6 +447,16 @@ func (self *RealFsInfo) GetDirFsDevice(dir string) (*DeviceInfo, error) { ...@@ -451,6 +447,16 @@ func (self *RealFsInfo) GetDirFsDevice(dir string) (*DeviceInfo, error) {
return &DeviceInfo{device, major, minor}, nil return &DeviceInfo{device, major, minor}, nil
} }
} }
mount, found := self.mounts[dir]
if found && mount.Fstype == "btrfs" && mount.Major == 0 && strings.HasPrefix(mount.Source, "/dev/") {
major, minor, err := getBtrfsMajorMinorIds(mount)
if err != nil {
glog.Warningf("%s", err)
} else {
return &DeviceInfo{mount.Source, uint(major), uint(minor)}, nil
}
}
return nil, fmt.Errorf("could not find device with major: %d, minor: %d in cached partitions map", major, minor) return nil, fmt.Errorf("could not find device with major: %d, minor: %d in cached partitions map", major, minor)
} }
...@@ -644,3 +650,32 @@ func (b *byteCounter) Write(p []byte) (int, error) { ...@@ -644,3 +650,32 @@ func (b *byteCounter) Write(p []byte) (int, error) {
b.bytesWritten += uint64(len(p)) b.bytesWritten += uint64(len(p))
return len(p), nil return len(p), nil
} }
// Get major and minor Ids for a mount point using btrfs as filesystem.
func getBtrfsMajorMinorIds(mount *mount.Info) (int, int, error) {
// btrfs fix: following workaround fixes wrong btrfs Major and Minor Ids reported in /proc/self/mountinfo.
// instead of using values from /proc/self/mountinfo we use stat to get Ids from btrfs mount point
buf := new(syscall.Stat_t)
err := syscall.Stat(mount.Source, buf)
if err != nil {
err = fmt.Errorf("stat failed on %s with error: %s", mount.Source, err)
return 0, 0, err
}
glog.Infof("btrfs mount %#v", mount)
if buf.Mode&syscall.S_IFMT == syscall.S_IFBLK {
err := syscall.Stat(mount.Mountpoint, buf)
if err != nil {
err = fmt.Errorf("stat failed on %s with error: %s", mount.Mountpoint, err)
return 0, 0, err
}
glog.Infof("btrfs dev major:minor %d:%d\n", int(major(buf.Dev)), int(minor(buf.Dev)))
glog.Infof("btrfs rdev major:minor %d:%d\n", int(major(buf.Rdev)), int(minor(buf.Rdev)))
return int(major(buf.Dev)), int(minor(buf.Dev)), nil
} else {
return 0, 0, fmt.Errorf("%s is not a block device", mount.Source)
}
}
vendor/github.com/google/cadvisor/http/handlers.go
View file @ fa71aac0
...@@ -44,7 +44,7 @@ func RegisterHandlers(mux httpmux.Mux, containerManager manager.Manager, httpAut ...@@ -44,7 +44,7 @@ func RegisterHandlers(mux httpmux.Mux, containerManager manager.Manager, httpAut
mux.HandleFunc(validate.ValidatePage, func(w http.ResponseWriter, r *http.Request) { mux.HandleFunc(validate.ValidatePage, func(w http.ResponseWriter, r *http.Request) {
err := validate.HandleRequest(w, containerManager) err := validate.HandleRequest(w, containerManager)
if err != nil { if err != nil {
fmt.Fprintf(w, "%s", err) http.Error(w, err.Error(), http.StatusInternalServerError)
} }
}) })
...@@ -104,15 +104,9 @@ func RegisterPrometheusHandler(mux httpmux.Mux, containerManager manager.Manager ...@@ -104,15 +104,9 @@ func RegisterPrometheusHandler(mux httpmux.Mux, containerManager manager.Manager
} }
func staticHandlerNoAuth(w http.ResponseWriter, r *http.Request) { func staticHandlerNoAuth(w http.ResponseWriter, r *http.Request) {
err := static.HandleRequest(w, r.URL) static.HandleRequest(w, r.URL)
if err != nil {
fmt.Fprintf(w, "%s", err)
}
} }
func staticHandler(w http.ResponseWriter, r *auth.AuthenticatedRequest) { func staticHandler(w http.ResponseWriter, r *auth.AuthenticatedRequest) {
err := static.HandleRequest(w, r.URL) static.HandleRequest(w, r.URL)
if err != nil {
fmt.Fprintf(w, "%s", err)
}
} }
vendor/github.com/google/cadvisor/info/v1/machine.go
View file @ fa71aac0
...@@ -94,6 +94,14 @@ func (self *Node) AddPerCoreCache(c Cache) { ...@@ -94,6 +94,14 @@ func (self *Node) AddPerCoreCache(c Cache) {
} }
} }
type HugePagesInfo struct {
// huge page size (in kB)
PageSize uint64 `json:"page_size"`
// number of huge pages
NumPages uint64 `json:"num_pages"`
}
type DiskInfo struct { type DiskInfo struct {
// device name // device name
Name string `json:"name"` Name string `json:"name"`
...@@ -158,6 +166,9 @@ type MachineInfo struct { ...@@ -158,6 +166,9 @@ type MachineInfo struct {
// The amount of memory (in bytes) in this machine // The amount of memory (in bytes) in this machine
MemoryCapacity uint64 `json:"memory_capacity"` MemoryCapacity uint64 `json:"memory_capacity"`
// HugePages on this machine.
HugePages []HugePagesInfo `json:"hugepages"`
// The machine id // The machine id
MachineID string `json:"machine_id"` MachineID string `json:"machine_id"`
......
vendor/github.com/google/cadvisor/info/v2/machine.go
View file @ fa71aac0
...@@ -52,6 +52,9 @@ type Attributes struct { ...@@ -52,6 +52,9 @@ type Attributes struct {
// The system uuid // The system uuid
SystemUUID string `json:"system_uuid"` SystemUUID string `json:"system_uuid"`
// HugePages on this machine.
HugePages []v1.HugePagesInfo `json:"hugepages"`
// Filesystems on this machine. // Filesystems on this machine.
Filesystems []v1.FsInfo `json:"filesystems"` Filesystems []v1.FsInfo `json:"filesystems"`
......
vendor/github.com/google/cadvisor/machine/info.go
View file @ fa71aac0
...@@ -17,8 +17,10 @@ package machine ...@@ -17,8 +17,10 @@ package machine
import ( import (
"bytes" "bytes"
"flag" "flag"
"fmt"
"io/ioutil" "io/ioutil"
"path/filepath" "path/filepath"
"strconv"
"strings" "strings"
"syscall" "syscall"
...@@ -31,6 +33,8 @@ import ( ...@@ -31,6 +33,8 @@ import (
"github.com/golang/glog" "github.com/golang/glog"
) )
const hugepagesDirectory = "/sys/kernel/mm/hugepages/"
var machineIdFilePath = flag.String("machine_id_file", "/etc/machine-id,/var/lib/dbus/machine-id", "Comma-separated list of files to check for machine-id. Use the first one that exists.") var machineIdFilePath = flag.String("machine_id_file", "/etc/machine-id,/var/lib/dbus/machine-id", "Comma-separated list of files to check for machine-id. Use the first one that exists.")
var bootIdFilePath = flag.String("boot_id_file", "/proc/sys/kernel/random/boot_id", "Comma-separated list of files to check for boot-id. Use the first one that exists.") var bootIdFilePath = flag.String("boot_id_file", "/proc/sys/kernel/random/boot_id", "Comma-separated list of files to check for boot-id. Use the first one that exists.")
...@@ -48,6 +52,45 @@ func getInfoFromFiles(filePaths string) string { ...@@ -48,6 +52,45 @@ func getInfoFromFiles(filePaths string) string {
return "" return ""
} }
// GetHugePagesInfo returns information about pre-allocated huge pages
func GetHugePagesInfo() ([]info.HugePagesInfo, error) {
var hugePagesInfo []info.HugePagesInfo
files, err := ioutil.ReadDir(hugepagesDirectory)
if err != nil {
// treat as non-fatal since kernels and machine can be
// configured to disable hugepage support
return hugePagesInfo, nil
}
for _, st := range files {
nameArray := strings.Split(st.Name(), "-")
pageSizeArray := strings.Split(nameArray[1], "kB")
pageSize, err := strconv.ParseUint(string(pageSizeArray[0]), 10, 64)
if err != nil {
return hugePagesInfo, err
}
numFile := hugepagesDirectory + st.Name() + "/nr_hugepages"
val, err := ioutil.ReadFile(numFile)
if err != nil {
return hugePagesInfo, err
}
var numPages uint64
// we use sscanf as the file as a new-line that trips up ParseUint
// it returns the number of tokens successfully parsed, so if
// n != 1, it means we were unable to parse a number from the file
n, err := fmt.Sscanf(string(val), "%d", &numPages)
if err != nil || n != 1 {
return hugePagesInfo, fmt.Errorf("could not parse file %v contents %q", numFile, string(val))
}
hugePagesInfo = append(hugePagesInfo, info.HugePagesInfo{
NumPages: numPages,
PageSize: pageSize,
})
}
return hugePagesInfo, nil
}
func Info(sysFs sysfs.SysFs, fsInfo fs.FsInfo, inHostNamespace bool) (*info.MachineInfo, error) { func Info(sysFs sysfs.SysFs, fsInfo fs.FsInfo, inHostNamespace bool) (*info.MachineInfo, error) {
rootFs := "/" rootFs := "/"
if !inHostNamespace { if !inHostNamespace {
...@@ -65,6 +108,11 @@ func Info(sysFs sysfs.SysFs, fsInfo fs.FsInfo, inHostNamespace bool) (*info.Mach ...@@ -65,6 +108,11 @@ func Info(sysFs sysfs.SysFs, fsInfo fs.FsInfo, inHostNamespace bool) (*info.Mach
return nil, err return nil, err
} }
hugePagesInfo, err := GetHugePagesInfo()
if err != nil {
return nil, err
}
filesystems, err := fsInfo.GetGlobalFsInfo() filesystems, err := fsInfo.GetGlobalFsInfo()
if err != nil { if err != nil {
glog.Errorf("Failed to get global filesystem information: %v", err) glog.Errorf("Failed to get global filesystem information: %v", err)
...@@ -99,6 +147,7 @@ func Info(sysFs sysfs.SysFs, fsInfo fs.FsInfo, inHostNamespace bool) (*info.Mach ...@@ -99,6 +147,7 @@ func Info(sysFs sysfs.SysFs, fsInfo fs.FsInfo, inHostNamespace bool) (*info.Mach
NumCores: numCores, NumCores: numCores,
CpuFrequency: clockSpeed, CpuFrequency: clockSpeed,
MemoryCapacity: memoryCapacity, MemoryCapacity: memoryCapacity,
HugePages: hugePagesInfo,
DiskMap: diskMap, DiskMap: diskMap,
NetworkDevices: netDevices, NetworkDevices: netDevices,
Topology: topology, Topology: topology,
......
vendor/github.com/google/cadvisor/manager/container.go
View file @ fa71aac0
...@@ -113,17 +113,19 @@ func (c *containerData) allowErrorLogging() bool { ...@@ -113,17 +113,19 @@ func (c *containerData) allowErrorLogging() bool {
return false return false
} }
func (c *containerData) GetInfo() (*containerInfo, error) { func (c *containerData) GetInfo(shouldUpdateSubcontainers bool) (*containerInfo, error) {
// Get spec and subcontainers. // Get spec and subcontainers.
if time.Since(c.lastUpdatedTime) > 5*time.Second { if time.Since(c.lastUpdatedTime) > 5*time.Second {
err := c.updateSpec() err := c.updateSpec()
if err != nil { if err != nil {
return nil, err return nil, err
} }
if shouldUpdateSubcontainers {
err = c.updateSubcontainers() err = c.updateSubcontainers()
if err != nil { if err != nil {
return nil, err return nil, err
} }
}
c.lastUpdatedTime = time.Now() c.lastUpdatedTime = time.Now()
} }
// Make a copy of the info for the user. // Make a copy of the info for the user.
......
vendor/github.com/google/cadvisor/manager/manager.go
View file @ fa71aac0
...@@ -400,7 +400,7 @@ func (self *manager) GetContainerSpec(containerName string, options v2.RequestOp ...@@ -400,7 +400,7 @@ func (self *manager) GetContainerSpec(containerName string, options v2.RequestOp
var errs partialFailure var errs partialFailure
specs := make(map[string]v2.ContainerSpec) specs := make(map[string]v2.ContainerSpec)
for name, cont := range conts { for name, cont := range conts {
cinfo, err := cont.GetInfo() cinfo, err := cont.GetInfo(false)
if err != nil { if err != nil {
errs.append(name, "GetInfo", err) errs.append(name, "GetInfo", err)
} }
...@@ -449,7 +449,7 @@ func (self *manager) GetContainerInfoV2(containerName string, options v2.Request ...@@ -449,7 +449,7 @@ func (self *manager) GetContainerInfoV2(containerName string, options v2.Request
infos := make(map[string]v2.ContainerInfo, len(containers)) infos := make(map[string]v2.ContainerInfo, len(containers))
for name, container := range containers { for name, container := range containers {
result := v2.ContainerInfo{} result := v2.ContainerInfo{}
cinfo, err := container.GetInfo() cinfo, err := container.GetInfo(false)
if err != nil { if err != nil {
errs.append(name, "GetInfo", err) errs.append(name, "GetInfo", err)
infos[name] = result infos[name] = result
...@@ -473,7 +473,7 @@ func (self *manager) GetContainerInfoV2(containerName string, options v2.Request ...@@ -473,7 +473,7 @@ func (self *manager) GetContainerInfoV2(containerName string, options v2.Request
func (self *manager) containerDataToContainerInfo(cont *containerData, query *info.ContainerInfoRequest) (*info.ContainerInfo, error) { func (self *manager) containerDataToContainerInfo(cont *containerData, query *info.ContainerInfoRequest) (*info.ContainerInfo, error) {
// Get the info from the container. // Get the info from the container.
cinfo, err := cont.GetInfo() cinfo, err := cont.GetInfo(true)
if err != nil { if err != nil {
return nil, err return nil, err
} }
......
vendor/github.com/google/cadvisor/metrics/prometheus.go
View file @ fa71aac0
...@@ -190,6 +190,13 @@ func NewPrometheusCollector(i infoProvider, f ContainerLabelsFunc) *PrometheusCo ...@@ -190,6 +190,13 @@ func NewPrometheusCollector(i infoProvider, f ContainerLabelsFunc) *PrometheusCo
return metricValues{{value: float64(s.Cpu.CFS.ThrottledTime) / float64(time.Second)}} return metricValues{{value: float64(s.Cpu.CFS.ThrottledTime) / float64(time.Second)}}
}, },
}, { }, {
name: "container_cpu_load_average_10s",
help: "Value of container cpu load average over the last 10 seconds.",
valueType: prometheus.GaugeValue,
getValues: func(s *info.ContainerStats) metricValues {
return metricValues{{value: float64(s.Cpu.LoadAverage)}}
},
}, {
name: "container_memory_cache", name: "container_memory_cache",
help: "Number of bytes of page cache memory.", help: "Number of bytes of page cache memory.",
valueType: prometheus.GaugeValue, valueType: prometheus.GaugeValue,
...@@ -579,6 +586,84 @@ func NewPrometheusCollector(i infoProvider, f ContainerLabelsFunc) *PrometheusCo ...@@ -579,6 +586,84 @@ func NewPrometheusCollector(i infoProvider, f ContainerLabelsFunc) *PrometheusCo
return values return values
}, },
}, { }, {
name: "container_network_tcp_usage_total",
help: "tcp connection usage statistic for container",
valueType: prometheus.GaugeValue,
extraLabels: []string{"tcp_state"},
getValues: func(s *info.ContainerStats) metricValues {
return metricValues{
{
value: float64(s.Network.Tcp.Established),
labels: []string{"established"},
},
{
value: float64(s.Network.Tcp.SynSent),
labels: []string{"synsent"},
},
{
value: float64(s.Network.Tcp.SynRecv),
labels: []string{"synrecv"},
},
{
value: float64(s.Network.Tcp.FinWait1),
labels: []string{"finwait1"},
},
{
value: float64(s.Network.Tcp.FinWait2),
labels: []string{"finwait2"},
},
{
value: float64(s.Network.Tcp.TimeWait),
labels: []string{"timewait"},
},
{
value: float64(s.Network.Tcp.Close),
labels: []string{"close"},
},
{
value: float64(s.Network.Tcp.CloseWait),
labels: []string{"closewait"},
},
{
value: float64(s.Network.Tcp.LastAck),
labels: []string{"lastack"},
},
{
value: float64(s.Network.Tcp.Listen),
labels: []string{"listen"},
},
{
value: float64(s.Network.Tcp.Closing),
labels: []string{"closing"},
},
}
},
}, {
name: "container_network_udp_usage_total",
help: "udp connection usage statistic for container",
valueType: prometheus.GaugeValue,
extraLabels: []string{"udp_state"},
getValues: func(s *info.ContainerStats) metricValues {
return metricValues{
{
value: float64(s.Network.Udp.Listen),
labels: []string{"listen"},
},
{
value: float64(s.Network.Udp.Dropped),
labels: []string{"dropped"},
},
{
value: float64(s.Network.Udp.RxQueued),
labels: []string{"rxqueued"},
},
{
value: float64(s.Network.Udp.TxQueued),
labels: []string{"txqueued"},
},
}
},
}, {
name: "container_tasks_state", name: "container_tasks_state",
help: "Number of tasks in given state", help: "Number of tasks in given state",
extraLabels: []string{"state"}, extraLabels: []string{"state"},
...@@ -610,6 +695,7 @@ func NewPrometheusCollector(i infoProvider, f ContainerLabelsFunc) *PrometheusCo ...@@ -610,6 +695,7 @@ func NewPrometheusCollector(i infoProvider, f ContainerLabelsFunc) *PrometheusCo
}, },
}, },
} }
return c return c
} }
......
vendor/github.com/google/cadvisor/pages/containers.go
View file @ fa71aac0
...@@ -163,7 +163,7 @@ func printUnit(bytes uint64) string { ...@@ -163,7 +163,7 @@ func printUnit(bytes uint64) string {
return ByteSize(bytes).Unit() return ByteSize(bytes).Unit()
} }
func serveContainersPage(m manager.Manager, w http.ResponseWriter, u *url.URL) error { func serveContainersPage(m manager.Manager, w http.ResponseWriter, u *url.URL) {
start := time.Now() start := time.Now()
// The container name is the path after the handler // The container name is the path after the handler
...@@ -175,14 +175,16 @@ func serveContainersPage(m manager.Manager, w http.ResponseWriter, u *url.URL) e ...@@ -175,14 +175,16 @@ func serveContainersPage(m manager.Manager, w http.ResponseWriter, u *url.URL) e
} }
cont, err := m.GetContainerInfo(containerName, &reqParams) cont, err := m.GetContainerInfo(containerName, &reqParams)
if err != nil { if err != nil {
return fmt.Errorf("failed to get container %q with error: %v", containerName, err) http.Error(w, fmt.Sprintf("failed to get container %q with error: %v", containerName, err), http.StatusNotFound)
return
} }
displayName := getContainerDisplayName(cont.ContainerReference) displayName := getContainerDisplayName(cont.ContainerReference)
// Get the MachineInfo // Get the MachineInfo
machineInfo, err := m.GetMachineInfo() machineInfo, err := m.GetMachineInfo()
if err != nil { if err != nil {
return err http.Error(w, fmt.Sprintf("failed to get machine info: %v", err), http.StatusInternalServerError)
return
} }
rootDir := getRootDir(containerName) rootDir := getRootDir(containerName)
...@@ -241,7 +243,6 @@ func serveContainersPage(m manager.Manager, w http.ResponseWriter, u *url.URL) e ...@@ -241,7 +243,6 @@ func serveContainersPage(m manager.Manager, w http.ResponseWriter, u *url.URL) e
} }
glog.V(5).Infof("Request took %s", time.Since(start)) glog.V(5).Infof("Request took %s", time.Since(start))
return nil
} }
// Build a relative path to the root of the container page. // Build a relative path to the root of the container page.
......
vendor/github.com/google/cadvisor/pages/docker.go
View file @ fa71aac0
...@@ -51,7 +51,7 @@ func toStatusKV(status info.DockerStatus) ([]keyVal, []keyVal) { ...@@ -51,7 +51,7 @@ func toStatusKV(status info.DockerStatus) ([]keyVal, []keyVal) {
}, ds }, ds
} }
func serveDockerPage(m manager.Manager, w http.ResponseWriter, u *url.URL) error { func serveDockerPage(m manager.Manager, w http.ResponseWriter, u *url.URL) {
start := time.Now() start := time.Now()
// The container name is the path after the handler // The container name is the path after the handler
...@@ -66,7 +66,8 @@ func serveDockerPage(m manager.Manager, w http.ResponseWriter, u *url.URL) error ...@@ -66,7 +66,8 @@ func serveDockerPage(m manager.Manager, w http.ResponseWriter, u *url.URL) error
} }
conts, err := m.AllDockerContainers(&reqParams) conts, err := m.AllDockerContainers(&reqParams)
if err != nil { if err != nil {
return fmt.Errorf("failed to get container %q with error: %v", containerName, err) http.Error(w, fmt.Sprintf("failed to get container %q with error: %v", containerName, err), http.StatusNotFound)
return
} }
subcontainers := make([]link, 0, len(conts)) subcontainers := make([]link, 0, len(conts))
for _, cont := range conts { for _, cont := range conts {
...@@ -79,14 +80,16 @@ func serveDockerPage(m manager.Manager, w http.ResponseWriter, u *url.URL) error ...@@ -79,14 +80,16 @@ func serveDockerPage(m manager.Manager, w http.ResponseWriter, u *url.URL) error
// Get Docker status // Get Docker status
status, err := m.DockerInfo() status, err := m.DockerInfo()
if err != nil { if err != nil {
return err http.Error(w, fmt.Sprintf("failed to get docker info: %v", err), http.StatusInternalServerError)
return
} }
dockerStatus, driverStatus := toStatusKV(status) dockerStatus, driverStatus := toStatusKV(status)
// Get Docker Images // Get Docker Images
images, err := m.DockerImages() images, err := m.DockerImages()
if err != nil { if err != nil {
return err http.Error(w, fmt.Sprintf("failed to get docker images: %v", err), http.StatusInternalServerError)
return
} }
dockerContainersText := "Docker Containers" dockerContainersText := "Docker Containers"
...@@ -110,7 +113,8 @@ func serveDockerPage(m manager.Manager, w http.ResponseWriter, u *url.URL) error ...@@ -110,7 +113,8 @@ func serveDockerPage(m manager.Manager, w http.ResponseWriter, u *url.URL) error
} }
cont, err := m.DockerContainer(containerName[1:], &reqParams) cont, err := m.DockerContainer(containerName[1:], &reqParams)
if err != nil { if err != nil {
return fmt.Errorf("failed to get container %q with error: %v", containerName, err) http.Error(w, fmt.Sprintf("failed to get container %q with error: %v", containerName, err), http.StatusNotFound)
return
} }
displayName := getContainerDisplayName(cont.ContainerReference) displayName := getContainerDisplayName(cont.ContainerReference)
...@@ -128,7 +132,8 @@ func serveDockerPage(m manager.Manager, w http.ResponseWriter, u *url.URL) error ...@@ -128,7 +132,8 @@ func serveDockerPage(m manager.Manager, w http.ResponseWriter, u *url.URL) error
// Get the MachineInfo // Get the MachineInfo
machineInfo, err := m.GetMachineInfo() machineInfo, err := m.GetMachineInfo()
if err != nil { if err != nil {
return err http.Error(w, fmt.Sprintf("failed to get machine info: %v", err), http.StatusInternalServerError)
return
} }
data = &pageData{ data = &pageData{
DisplayName: displayName, DisplayName: displayName,
...@@ -153,5 +158,5 @@ func serveDockerPage(m manager.Manager, w http.ResponseWriter, u *url.URL) error ...@@ -153,5 +158,5 @@ func serveDockerPage(m manager.Manager, w http.ResponseWriter, u *url.URL) error
} }
glog.V(5).Infof("Request took %s", time.Since(start)) glog.V(5).Infof("Request took %s", time.Since(start))
return nil return
} }
vendor/github.com/google/cadvisor/pages/pages.go
View file @ fa71aac0
...@@ -77,37 +77,25 @@ func init() { ...@@ -77,37 +77,25 @@ func init() {
func containerHandlerNoAuth(containerManager manager.Manager) http.HandlerFunc { func containerHandlerNoAuth(containerManager manager.Manager) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) { return func(w http.ResponseWriter, r *http.Request) {
err := serveContainersPage(containerManager, w, r.URL) serveContainersPage(containerManager, w, r.URL)
if err != nil {
fmt.Fprintf(w, "%s", err)
}
} }
} }
func containerHandler(containerManager manager.Manager) auth.AuthenticatedHandlerFunc { func containerHandler(containerManager manager.Manager) auth.AuthenticatedHandlerFunc {
return func(w http.ResponseWriter, r *auth.AuthenticatedRequest) { return func(w http.ResponseWriter, r *auth.AuthenticatedRequest) {
err := serveContainersPage(containerManager, w, r.URL) serveContainersPage(containerManager, w, r.URL)
if err != nil {
fmt.Fprintf(w, "%s", err)
}
} }
} }
func dockerHandlerNoAuth(containerManager manager.Manager) http.HandlerFunc { func dockerHandlerNoAuth(containerManager manager.Manager) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) { return func(w http.ResponseWriter, r *http.Request) {
err := serveDockerPage(containerManager, w, r.URL) serveDockerPage(containerManager, w, r.URL)
if err != nil {
fmt.Fprintf(w, "%s", err)
}
} }
} }
func dockerHandler(containerManager manager.Manager) auth.AuthenticatedHandlerFunc { func dockerHandler(containerManager manager.Manager) auth.AuthenticatedHandlerFunc {
return func(w http.ResponseWriter, r *auth.AuthenticatedRequest) { return func(w http.ResponseWriter, r *auth.AuthenticatedRequest) {
err := serveDockerPage(containerManager, w, r.URL) serveDockerPage(containerManager, w, r.URL)
if err != nil {
fmt.Fprintf(w, "%s", err)
}
} }
} }
......
vendor/github.com/google/cadvisor/pages/static/BUILD
View file @ fa71aac0
...@@ -7,6 +7,7 @@ go_library( ...@@ -7,6 +7,7 @@ go_library(
"static.go", "static.go",
], ],
visibility = ["//visibility:public"], visibility = ["//visibility:public"],
deps = ["//vendor/github.com/golang/glog:go_default_library"],
) )
filegroup( filegroup(
......
vendor/github.com/google/cadvisor/pages/static/assets.go
View file @ fa71aac0
This source diff could not be displayed because it is too large. You can view the blob instead.
vendor/github.com/google/cadvisor/pages/static/static.go
View file @ fa71aac0
...@@ -22,6 +22,8 @@ import ( ...@@ -22,6 +22,8 @@ import (
"net/http" "net/http"
"net/url" "net/url"
"path" "path"
"github.com/golang/glog"
) )
const StaticResource = "/static/" const StaticResource = "/static/"
...@@ -47,16 +49,18 @@ var staticFiles = map[string][]byte{ ...@@ -47,16 +49,18 @@ var staticFiles = map[string][]byte{
"jquery-1.10.2.min.js": jqueryJs, "jquery-1.10.2.min.js": jqueryJs,
} }
func HandleRequest(w http.ResponseWriter, u *url.URL) error { func HandleRequest(w http.ResponseWriter, u *url.URL) {
if len(u.Path) <= len(StaticResource) { if len(u.Path) <= len(StaticResource) {
return fmt.Errorf("unknown static resource %q", u.Path) http.Error(w, fmt.Sprintf("unknown static resource %q", u.Path), http.StatusNotFound)
return
} }
// Get the static content if it exists. // Get the static content if it exists.
resource := u.Path[len(StaticResource):] resource := u.Path[len(StaticResource):]
content, ok := staticFiles[resource] content, ok := staticFiles[resource]
if !ok { if !ok {
return fmt.Errorf("unknown static resource %q", resource) http.Error(w, fmt.Sprintf("unknown static resource %q", u.Path), http.StatusNotFound)
return
} }
// Set Content-Type if we were able to detect it. // Set Content-Type if we were able to detect it.
...@@ -65,6 +69,7 @@ func HandleRequest(w http.ResponseWriter, u *url.URL) error { ...@@ -65,6 +69,7 @@ func HandleRequest(w http.ResponseWriter, u *url.URL) error {
w.Header().Set("Content-Type", contentType) w.Header().Set("Content-Type", contentType)
} }
_, err := w.Write(content) if _, err := w.Write(content); err != nil {
return err glog.Errorf("Failed to write response: %v", err)
}
} }
vendor/github.com/google/cadvisor/utils/oomparser/oomparser.go
View file @ fa71aac0
...@@ -32,7 +32,7 @@ import ( ...@@ -32,7 +32,7 @@ import (
var ( var (
containerRegexp = regexp.MustCompile(`Task in (.*) killed as a result of limit of (.*)`) containerRegexp = regexp.MustCompile(`Task in (.*) killed as a result of limit of (.*)`)
lastLineRegexp = regexp.MustCompile(`(^[A-Z][a-z]{2} .*[0-9]{1,2} [0-9]{1,2}:[0-9]{2}:[0-9]{2}) .* Killed process ([0-9]+) \(([\w]+)\)`) lastLineRegexp = regexp.MustCompile(`(^[A-Z][a-z]{2} .*[0-9]{1,2} [0-9]{1,2}:[0-9]{2}:[0-9]{2}) .* Killed process ([0-9]+) \((.+)\)`)
firstLineRegexp = regexp.MustCompile(`invoked oom-killer:`) firstLineRegexp = regexp.MustCompile(`invoked oom-killer:`)
) )
......
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