Skip to content

K
k3s
Commit e740e426 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #52175 from sjenning/bump-cadv

Automatic merge from submit-queue (batch tested with PRs 50949, 52155, 52175, 52112, 52188) bump(github.com/google/cadvisor): cda62a43857256fbc95dd31e7c810888f00f8ec7 Bump cadvisor to v0.27.1 for cri-o enhancements @derekwaynecarr @runcom @dashpole /release-note-none /sig node
parents e5dc995c 0b052386
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 801 additions and 80 deletions
Godeps/Godeps.json
View file @ e740e426
...@@ -1368,203 +1368,208 @@ ...@@ -1368,203 +1368,208 @@
}, },
{ {
"ImportPath": "github.com/google/cadvisor/api", "ImportPath": "github.com/google/cadvisor/api",
"Comment": "v0.27.0-2-g1df21ea", "Comment": "v0.27.1",
"Rev": "1df21eaa592316b0889db44ab0b3c22d66846482" "Rev": "cda62a43857256fbc95dd31e7c810888f00f8ec7"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/cache/memory", "ImportPath": "github.com/google/cadvisor/cache/memory",
"Comment": "v0.27.0-2-g1df21ea", "Comment": "v0.27.1",
"Rev": "1df21eaa592316b0889db44ab0b3c22d66846482" "Rev": "cda62a43857256fbc95dd31e7c810888f00f8ec7"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/client/v2", "ImportPath": "github.com/google/cadvisor/client/v2",
"Comment": "v0.27.0-2-g1df21ea", "Comment": "v0.27.1",
"Rev": "1df21eaa592316b0889db44ab0b3c22d66846482" "Rev": "cda62a43857256fbc95dd31e7c810888f00f8ec7"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/collector", "ImportPath": "github.com/google/cadvisor/collector",
"Comment": "v0.27.0-2-g1df21ea", "Comment": "v0.27.1",
"Rev": "1df21eaa592316b0889db44ab0b3c22d66846482" "Rev": "cda62a43857256fbc95dd31e7c810888f00f8ec7"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/container", "ImportPath": "github.com/google/cadvisor/container",
"Comment": "v0.27.0-2-g1df21ea", "Comment": "v0.27.1",
"Rev": "1df21eaa592316b0889db44ab0b3c22d66846482" "Rev": "cda62a43857256fbc95dd31e7c810888f00f8ec7"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/container/common", "ImportPath": "github.com/google/cadvisor/container/common",
"Comment": "v0.27.0-2-g1df21ea", "Comment": "v0.27.1",
"Rev": "1df21eaa592316b0889db44ab0b3c22d66846482" "Rev": "cda62a43857256fbc95dd31e7c810888f00f8ec7"
},
{
"ImportPath": "github.com/google/cadvisor/container/crio",
"Comment": "v0.27.1",
"Rev": "cda62a43857256fbc95dd31e7c810888f00f8ec7"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/container/docker", "ImportPath": "github.com/google/cadvisor/container/docker",
"Comment": "v0.27.0-2-g1df21ea", "Comment": "v0.27.1",
"Rev": "1df21eaa592316b0889db44ab0b3c22d66846482" "Rev": "cda62a43857256fbc95dd31e7c810888f00f8ec7"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/container/libcontainer", "ImportPath": "github.com/google/cadvisor/container/libcontainer",
"Comment": "v0.27.0-2-g1df21ea", "Comment": "v0.27.1",
"Rev": "1df21eaa592316b0889db44ab0b3c22d66846482" "Rev": "cda62a43857256fbc95dd31e7c810888f00f8ec7"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/container/raw", "ImportPath": "github.com/google/cadvisor/container/raw",
"Comment": "v0.27.0-2-g1df21ea", "Comment": "v0.27.1",
"Rev": "1df21eaa592316b0889db44ab0b3c22d66846482" "Rev": "cda62a43857256fbc95dd31e7c810888f00f8ec7"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/container/rkt", "ImportPath": "github.com/google/cadvisor/container/rkt",
"Comment": "v0.27.0-2-g1df21ea", "Comment": "v0.27.1",
"Rev": "1df21eaa592316b0889db44ab0b3c22d66846482" "Rev": "cda62a43857256fbc95dd31e7c810888f00f8ec7"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/container/systemd", "ImportPath": "github.com/google/cadvisor/container/systemd",
"Comment": "v0.27.0-2-g1df21ea", "Comment": "v0.27.1",
"Rev": "1df21eaa592316b0889db44ab0b3c22d66846482" "Rev": "cda62a43857256fbc95dd31e7c810888f00f8ec7"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/devicemapper", "ImportPath": "github.com/google/cadvisor/devicemapper",
"Comment": "v0.27.0-2-g1df21ea", "Comment": "v0.27.1",
"Rev": "1df21eaa592316b0889db44ab0b3c22d66846482" "Rev": "cda62a43857256fbc95dd31e7c810888f00f8ec7"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/events", "ImportPath": "github.com/google/cadvisor/events",
"Comment": "v0.27.0-2-g1df21ea", "Comment": "v0.27.1",
"Rev": "1df21eaa592316b0889db44ab0b3c22d66846482" "Rev": "cda62a43857256fbc95dd31e7c810888f00f8ec7"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/fs", "ImportPath": "github.com/google/cadvisor/fs",
"Comment": "v0.27.0-2-g1df21ea", "Comment": "v0.27.1",
"Rev": "1df21eaa592316b0889db44ab0b3c22d66846482" "Rev": "cda62a43857256fbc95dd31e7c810888f00f8ec7"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/healthz", "ImportPath": "github.com/google/cadvisor/healthz",
"Comment": "v0.27.0-2-g1df21ea", "Comment": "v0.27.1",
"Rev": "1df21eaa592316b0889db44ab0b3c22d66846482" "Rev": "cda62a43857256fbc95dd31e7c810888f00f8ec7"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/http", "ImportPath": "github.com/google/cadvisor/http",
"Comment": "v0.27.0-2-g1df21ea", "Comment": "v0.27.1",
"Rev": "1df21eaa592316b0889db44ab0b3c22d66846482" "Rev": "cda62a43857256fbc95dd31e7c810888f00f8ec7"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/http/mux", "ImportPath": "github.com/google/cadvisor/http/mux",
"Comment": "v0.27.0-2-g1df21ea", "Comment": "v0.27.1",
"Rev": "1df21eaa592316b0889db44ab0b3c22d66846482" "Rev": "cda62a43857256fbc95dd31e7c810888f00f8ec7"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/info/v1", "ImportPath": "github.com/google/cadvisor/info/v1",
"Comment": "v0.27.0-2-g1df21ea", "Comment": "v0.27.1",
"Rev": "1df21eaa592316b0889db44ab0b3c22d66846482" "Rev": "cda62a43857256fbc95dd31e7c810888f00f8ec7"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/info/v2", "ImportPath": "github.com/google/cadvisor/info/v2",
"Comment": "v0.27.0-2-g1df21ea", "Comment": "v0.27.1",
"Rev": "1df21eaa592316b0889db44ab0b3c22d66846482" "Rev": "cda62a43857256fbc95dd31e7c810888f00f8ec7"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/machine", "ImportPath": "github.com/google/cadvisor/machine",
"Comment": "v0.27.0-2-g1df21ea", "Comment": "v0.27.1",
"Rev": "1df21eaa592316b0889db44ab0b3c22d66846482" "Rev": "cda62a43857256fbc95dd31e7c810888f00f8ec7"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/manager", "ImportPath": "github.com/google/cadvisor/manager",
"Comment": "v0.27.0-2-g1df21ea", "Comment": "v0.27.1",
"Rev": "1df21eaa592316b0889db44ab0b3c22d66846482" "Rev": "cda62a43857256fbc95dd31e7c810888f00f8ec7"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/manager/watcher", "ImportPath": "github.com/google/cadvisor/manager/watcher",
"Comment": "v0.27.0-2-g1df21ea", "Comment": "v0.27.1",
"Rev": "1df21eaa592316b0889db44ab0b3c22d66846482" "Rev": "cda62a43857256fbc95dd31e7c810888f00f8ec7"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/manager/watcher/raw", "ImportPath": "github.com/google/cadvisor/manager/watcher/raw",
"Comment": "v0.27.0-2-g1df21ea", "Comment": "v0.27.1",
"Rev": "1df21eaa592316b0889db44ab0b3c22d66846482" "Rev": "cda62a43857256fbc95dd31e7c810888f00f8ec7"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/manager/watcher/rkt", "ImportPath": "github.com/google/cadvisor/manager/watcher/rkt",
"Comment": "v0.27.0-2-g1df21ea", "Comment": "v0.27.1",
"Rev": "1df21eaa592316b0889db44ab0b3c22d66846482" "Rev": "cda62a43857256fbc95dd31e7c810888f00f8ec7"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/metrics", "ImportPath": "github.com/google/cadvisor/metrics",
"Comment": "v0.27.0-2-g1df21ea", "Comment": "v0.27.1",
"Rev": "1df21eaa592316b0889db44ab0b3c22d66846482" "Rev": "cda62a43857256fbc95dd31e7c810888f00f8ec7"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/pages", "ImportPath": "github.com/google/cadvisor/pages",
"Comment": "v0.27.0-2-g1df21ea", "Comment": "v0.27.1",
"Rev": "1df21eaa592316b0889db44ab0b3c22d66846482" "Rev": "cda62a43857256fbc95dd31e7c810888f00f8ec7"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/pages/static", "ImportPath": "github.com/google/cadvisor/pages/static",
"Comment": "v0.27.0-2-g1df21ea", "Comment": "v0.27.1",
"Rev": "1df21eaa592316b0889db44ab0b3c22d66846482" "Rev": "cda62a43857256fbc95dd31e7c810888f00f8ec7"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/storage", "ImportPath": "github.com/google/cadvisor/storage",
"Comment": "v0.27.0-2-g1df21ea", "Comment": "v0.27.1",
"Rev": "1df21eaa592316b0889db44ab0b3c22d66846482" "Rev": "cda62a43857256fbc95dd31e7c810888f00f8ec7"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/summary", "ImportPath": "github.com/google/cadvisor/summary",
"Comment": "v0.27.0-2-g1df21ea", "Comment": "v0.27.1",
"Rev": "1df21eaa592316b0889db44ab0b3c22d66846482" "Rev": "cda62a43857256fbc95dd31e7c810888f00f8ec7"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/utils", "ImportPath": "github.com/google/cadvisor/utils",
"Comment": "v0.27.0-2-g1df21ea", "Comment": "v0.27.1",
"Rev": "1df21eaa592316b0889db44ab0b3c22d66846482" "Rev": "cda62a43857256fbc95dd31e7c810888f00f8ec7"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/utils/cloudinfo", "ImportPath": "github.com/google/cadvisor/utils/cloudinfo",
"Comment": "v0.27.0-2-g1df21ea", "Comment": "v0.27.1",
"Rev": "1df21eaa592316b0889db44ab0b3c22d66846482" "Rev": "cda62a43857256fbc95dd31e7c810888f00f8ec7"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/utils/cpuload", "ImportPath": "github.com/google/cadvisor/utils/cpuload",
"Comment": "v0.27.0-2-g1df21ea", "Comment": "v0.27.1",
"Rev": "1df21eaa592316b0889db44ab0b3c22d66846482" "Rev": "cda62a43857256fbc95dd31e7c810888f00f8ec7"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/utils/cpuload/netlink", "ImportPath": "github.com/google/cadvisor/utils/cpuload/netlink",
"Comment": "v0.27.0-2-g1df21ea", "Comment": "v0.27.1",
"Rev": "1df21eaa592316b0889db44ab0b3c22d66846482" "Rev": "cda62a43857256fbc95dd31e7c810888f00f8ec7"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/utils/docker", "ImportPath": "github.com/google/cadvisor/utils/docker",
"Comment": "v0.27.0-2-g1df21ea", "Comment": "v0.27.1",
"Rev": "1df21eaa592316b0889db44ab0b3c22d66846482" "Rev": "cda62a43857256fbc95dd31e7c810888f00f8ec7"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/utils/oomparser", "ImportPath": "github.com/google/cadvisor/utils/oomparser",
"Comment": "v0.27.0-2-g1df21ea", "Comment": "v0.27.1",
"Rev": "1df21eaa592316b0889db44ab0b3c22d66846482" "Rev": "cda62a43857256fbc95dd31e7c810888f00f8ec7"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/utils/sysfs", "ImportPath": "github.com/google/cadvisor/utils/sysfs",
"Comment": "v0.27.0-2-g1df21ea", "Comment": "v0.27.1",
"Rev": "1df21eaa592316b0889db44ab0b3c22d66846482" "Rev": "cda62a43857256fbc95dd31e7c810888f00f8ec7"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/utils/sysinfo", "ImportPath": "github.com/google/cadvisor/utils/sysinfo",
"Comment": "v0.27.0-2-g1df21ea", "Comment": "v0.27.1",
"Rev": "1df21eaa592316b0889db44ab0b3c22d66846482" "Rev": "cda62a43857256fbc95dd31e7c810888f00f8ec7"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/validate", "ImportPath": "github.com/google/cadvisor/validate",
"Comment": "v0.27.0-2-g1df21ea", "Comment": "v0.27.1",
"Rev": "1df21eaa592316b0889db44ab0b3c22d66846482" "Rev": "cda62a43857256fbc95dd31e7c810888f00f8ec7"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/version", "ImportPath": "github.com/google/cadvisor/version",
"Comment": "v0.27.0-2-g1df21ea", "Comment": "v0.27.1",
"Rev": "1df21eaa592316b0889db44ab0b3c22d66846482" "Rev": "cda62a43857256fbc95dd31e7c810888f00f8ec7"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/zfs", "ImportPath": "github.com/google/cadvisor/zfs",
"Comment": "v0.27.0-2-g1df21ea", "Comment": "v0.27.1",
"Rev": "1df21eaa592316b0889db44ab0b3c22d66846482" "Rev": "cda62a43857256fbc95dd31e7c810888f00f8ec7"
}, },
{ {
"ImportPath": "github.com/google/certificate-transparency/go", "ImportPath": "github.com/google/certificate-transparency/go",
......
vendor/github.com/google/cadvisor/container/BUILD
View file @ e740e426
...@@ -26,6 +26,7 @@ filegroup( ...@@ -26,6 +26,7 @@ filegroup(
srcs = [ srcs = [
":package-srcs", ":package-srcs",
"//vendor/github.com/google/cadvisor/container/common:all-srcs", "//vendor/github.com/google/cadvisor/container/common:all-srcs",
"//vendor/github.com/google/cadvisor/container/crio:all-srcs",
"//vendor/github.com/google/cadvisor/container/docker:all-srcs", "//vendor/github.com/google/cadvisor/container/docker:all-srcs",
"//vendor/github.com/google/cadvisor/container/libcontainer:all-srcs", "//vendor/github.com/google/cadvisor/container/libcontainer:all-srcs",
"//vendor/github.com/google/cadvisor/container/raw:all-srcs", "//vendor/github.com/google/cadvisor/container/raw:all-srcs",
......
vendor/github.com/google/cadvisor/container/container.go
View file @ e740e426
...@@ -34,6 +34,7 @@ const ( ...@@ -34,6 +34,7 @@ const (
ContainerTypeDocker ContainerTypeDocker
ContainerTypeRkt ContainerTypeRkt
ContainerTypeSystemd ContainerTypeSystemd
ContainerTypeCrio
) )
// Interface for container operation handlers. // Interface for container operation handlers.
......
vendor/github.com/google/cadvisor/container/crio/BUILD 0 → 100644
View file @ e740e426
load("@io_bazel_rules_go//go:def.bzl", "go_library")
go_library(
name = "go_default_library",
srcs = [
"client.go",
"factory.go",
"handler.go",
],
visibility = ["//visibility:public"],
deps = [
"//vendor/github.com/golang/glog:go_default_library",
"//vendor/github.com/google/cadvisor/container:go_default_library",
"//vendor/github.com/google/cadvisor/container/common:go_default_library",
"//vendor/github.com/google/cadvisor/container/libcontainer:go_default_library",
"//vendor/github.com/google/cadvisor/fs:go_default_library",
"//vendor/github.com/google/cadvisor/info/v1:go_default_library",
"//vendor/github.com/google/cadvisor/manager/watcher:go_default_library",
"//vendor/github.com/opencontainers/runc/libcontainer/cgroups:go_default_library",
"//vendor/github.com/opencontainers/runc/libcontainer/cgroups/fs:go_default_library",
"//vendor/github.com/opencontainers/runc/libcontainer/configs:go_default_library",
],
)
filegroup(
name = "package-srcs",
srcs = glob(["**"]),
tags = ["automanaged"],
visibility = ["//visibility:private"],
)
filegroup(
name = "all-srcs",
srcs = [":package-srcs"],
tags = ["automanaged"],
visibility = ["//visibility:public"],
)
vendor/github.com/google/cadvisor/container/crio/client.go 0 → 100644
View file @ e740e426
// Copyright 2017 Google Inc. All Rights Reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
package crio
import (
"encoding/json"
"fmt"
"net"
"net/http"
"syscall"
"time"
)
const (
CrioSocket = "/var/run/crio.sock"
maxUnixSocketPathSize = len(syscall.RawSockaddrUnix{}.Path)
)
// Info represents CRI-O information as sent by the CRI-O server
type Info struct {
StorageDriver string `json:"storage_driver"`
StorageRoot string `json:"storage_root"`
}
// ContainerInfo represents a given container information
type ContainerInfo struct {
Name string `json:"name"`
Pid int `json:"pid"`
Image string `json:"image"`
CreatedTime int64 `json:"created_time"`
Labels map[string]string `json:"labels"`
Annotations map[string]string `json:"annotations"`
LogPath string `json:"log_path"`
Root string `json:"root"`
IP string `json:"ip_address"`
}
type crioClient interface {
Info() (Info, error)
ContainerInfo(string) (*ContainerInfo, error)
}
type crioClientImpl struct {
client *http.Client
}
func configureUnixTransport(tr *http.Transport, proto, addr string) error {
if len(addr) > maxUnixSocketPathSize {
return fmt.Errorf("Unix socket path %q is too long", addr)
}
// No need for compression in local communications.
tr.DisableCompression = true
tr.Dial = func(_, _ string) (net.Conn, error) {
return net.DialTimeout(proto, addr, 32*time.Second)
}
return nil
}
// Client returns a new configured CRI-O client
func Client() (crioClient, error) {
tr := new(http.Transport)
configureUnixTransport(tr, "unix", CrioSocket)
c := &http.Client{
Transport: tr,
}
return &crioClientImpl{
client: c,
}, nil
}
func getRequest(path string) (*http.Request, error) {
req, err := http.NewRequest("GET", path, nil)
if err != nil {
return nil, err
}
// For local communications over a unix socket, it doesn't matter what
// the host is. We just need a valid and meaningful host name.
req.Host = "crio"
req.URL.Host = CrioSocket
req.URL.Scheme = "http"
return req, nil
}
// Info returns generic info from the CRI-O server
func (c *crioClientImpl) Info() (Info, error) {
info := Info{}
req, err := getRequest("/info")
if err != nil {
return info, err
}
resp, err := c.client.Do(req)
if err != nil {
return info, err
}
defer resp.Body.Close()
if err := json.NewDecoder(resp.Body).Decode(&info); err != nil {
return info, err
}
return info, nil
}
// ContainerInfo returns information about a given container
func (c *crioClientImpl) ContainerInfo(id string) (*ContainerInfo, error) {
req, err := getRequest("/containers/" + id)
if err != nil {
return nil, err
}
resp, err := c.client.Do(req)
if err != nil {
return nil, err
}
defer resp.Body.Close()
cInfo := ContainerInfo{}
if err := json.NewDecoder(resp.Body).Decode(&cInfo); err != nil {
return nil, err
}
return &cInfo, nil
}
vendor/github.com/google/cadvisor/container/crio/factory.go 0 → 100644
View file @ e740e426
// Copyright 2017 Google Inc. All Rights Reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
package crio
import (
"fmt"
"path"
"regexp"
"strings"
"github.com/google/cadvisor/container"
"github.com/google/cadvisor/container/libcontainer"
"github.com/google/cadvisor/fs"
info "github.com/google/cadvisor/info/v1"
"github.com/google/cadvisor/manager/watcher"
"github.com/golang/glog"
)
// The namespace under which crio aliases are unique.
const CrioNamespace = "crio"
// Regexp that identifies CRI-O cgroups
var crioCgroupRegexp = regexp.MustCompile(`([a-z0-9]{64})`)
type storageDriver string
const (
// TODO add full set of supported drivers in future..
overlayStorageDriver storageDriver = "overlay"
overlay2StorageDriver storageDriver = "overlay2"
)
type crioFactory struct {
machineInfoFactory info.MachineInfoFactory
storageDriver storageDriver
storageDir string
// Information about the mounted cgroup subsystems.
cgroupSubsystems libcontainer.CgroupSubsystems
// Information about mounted filesystems.
fsInfo fs.FsInfo
ignoreMetrics container.MetricSet
client crioClient
}
func (self *crioFactory) String() string {
return CrioNamespace
}
func (self *crioFactory) NewContainerHandler(name string, inHostNamespace bool) (handler container.ContainerHandler, err error) {
client, err := Client()
if err != nil {
return
}
// TODO are there any env vars we need to white list, if so, do it here...
metadataEnvs := []string{}
handler, err = newCrioContainerHandler(
client,
name,
self.machineInfoFactory,
self.fsInfo,
self.storageDriver,
self.storageDir,
&self.cgroupSubsystems,
inHostNamespace,
metadataEnvs,
self.ignoreMetrics,
)
return
}
// Returns the CRIO ID from the full container name.
func ContainerNameToCrioId(name string) string {
id := path.Base(name)
if matches := crioCgroupRegexp.FindStringSubmatch(id); matches != nil {
return matches[1]
}
return id
}
// isContainerName returns true if the cgroup with associated name
// corresponds to a crio container.
func isContainerName(name string) bool {
// always ignore .mount cgroup even if associated with crio and delegate to systemd
if strings.HasSuffix(name, ".mount") {
return false
}
return crioCgroupRegexp.MatchString(path.Base(name))
}
// crio handles all containers under /crio
func (self *crioFactory) CanHandleAndAccept(name string) (bool, bool, error) {
if strings.HasPrefix(path.Base(name), "crio-conmon") {
// TODO(runcom): should we include crio-conmon cgroups?
return false, false, nil
}
if !strings.HasPrefix(path.Base(name), CrioNamespace) {
return false, false, nil
}
// if the container is not associated with CRI-O, we can't handle it or accept it.
if !isContainerName(name) {
return false, false, nil
}
return true, true, nil
}
func (self *crioFactory) DebugInfo() map[string][]string {
return map[string][]string{}
}
var (
// TODO(runcom): handle versioning in CRI-O
version_regexp_string = `(\d+)\.(\d+)\.(\d+)`
version_re = regexp.MustCompile(version_regexp_string)
apiversion_regexp_string = `(\d+)\.(\d+)`
apiversion_re = regexp.MustCompile(apiversion_regexp_string)
)
// Register root container before running this function!
func Register(factory info.MachineInfoFactory, fsInfo fs.FsInfo, ignoreMetrics container.MetricSet) error {
client, err := Client()
if err != nil {
return err
}
info, err := client.Info()
if err != nil {
return err
}
// TODO determine crio version so we can work differently w/ future versions if needed
cgroupSubsystems, err := libcontainer.GetCgroupSubsystems()
if err != nil {
return fmt.Errorf("failed to get cgroup subsystems: %v", err)
}
glog.Infof("Registering CRI-O factory")
f := &crioFactory{
client: client,
cgroupSubsystems: cgroupSubsystems,
fsInfo: fsInfo,
machineInfoFactory: factory,
storageDriver: storageDriver(info.StorageDriver),
storageDir: info.StorageRoot,
ignoreMetrics: ignoreMetrics,
}
container.RegisterContainerHandlerFactory(f, []watcher.ContainerWatchSource{watcher.Raw})
return nil
}
vendor/github.com/google/cadvisor/container/crio/handler.go 0 → 100644
View file @ e740e426
// Copyright 2017 Google Inc. All Rights Reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
// Handler for CRI-O containers.
package crio
import (
"fmt"
"path"
"strconv"
"strings"
"time"
"github.com/google/cadvisor/container"
"github.com/google/cadvisor/container/common"
containerlibcontainer "github.com/google/cadvisor/container/libcontainer"
"github.com/google/cadvisor/fs"
info "github.com/google/cadvisor/info/v1"
"github.com/opencontainers/runc/libcontainer/cgroups"
cgroupfs "github.com/opencontainers/runc/libcontainer/cgroups/fs"
libcontainerconfigs "github.com/opencontainers/runc/libcontainer/configs"
)
type crioContainerHandler struct {
name string
id string
aliases []string
machineInfoFactory info.MachineInfoFactory
// Absolute path to the cgroup hierarchies of this container.
// (e.g.: "cpu" -> "/sys/fs/cgroup/cpu/test")
cgroupPaths map[string]string
// Manager of this container's cgroups.
cgroupManager cgroups.Manager
// the CRI-O storage driver
storageDriver storageDriver
fsInfo fs.FsInfo
rootfsStorageDir string
// Time at which this container was created.
creationTime time.Time
// Metadata associated with the container.
labels map[string]string
envs map[string]string
// TODO
// crio version handling...
// The container PID used to switch namespaces as required
pid int
// Image name used for this container.
image string
// The host root FS to read
rootFs string
// The network mode of the container
// TODO
// Filesystem handler.
fsHandler common.FsHandler
// The IP address of the container
ipAddress string
ignoreMetrics container.MetricSet
// container restart count
restartCount int
}
var _ container.ContainerHandler = &crioContainerHandler{}
// newCrioContainerHandler returns a new container.ContainerHandler
func newCrioContainerHandler(
client crioClient,
name string,
machineInfoFactory info.MachineInfoFactory,
fsInfo fs.FsInfo,
storageDriver storageDriver,
storageDir string,
cgroupSubsystems *containerlibcontainer.CgroupSubsystems,
inHostNamespace bool,
metadataEnvs []string,
ignoreMetrics container.MetricSet,
) (container.ContainerHandler, error) {
// Create the cgroup paths.
cgroupPaths := make(map[string]string, len(cgroupSubsystems.MountPoints))
for key, val := range cgroupSubsystems.MountPoints {
cgroupPaths[key] = path.Join(val, name)
}
// Generate the equivalent cgroup manager for this container.
cgroupManager := &cgroupfs.Manager{
Cgroups: &libcontainerconfigs.Cgroup{
Name: name,
},
Paths: cgroupPaths,
}
rootFs := "/"
if !inHostNamespace {
rootFs = "/rootfs"
storageDir = path.Join(rootFs, storageDir)
}
id := ContainerNameToCrioId(name)
cInfo, err := client.ContainerInfo(id)
if err != nil {
return nil, err
}
// passed to fs handler below ...
// XXX: this is using the full container logpath, as constructed by the CRI
// /var/log/pods/<pod_uuid>/container_instance.log
// It's not actually a log dir, as the CRI doesn't have per-container dirs
// under /var/log/pods/<pod_uuid>/
// We can't use /var/log/pods/<pod_uuid>/ to count per-container log usage.
// We use the container log file directly.
storageLogDir := cInfo.LogPath
// Determine the rootfs storage dir
rootfsStorageDir := cInfo.Root
// TODO(runcom): CRI-O doesn't strip /merged but we need to in order to
// get device ID from root, otherwise, it's going to error out as overlay
// mounts doesn't have fixed dev ids.
rootfsStorageDir = strings.TrimSuffix(rootfsStorageDir, "/merged")
// TODO: extract object mother method
handler := &crioContainerHandler{
id: id,
name: name,
machineInfoFactory: machineInfoFactory,
cgroupPaths: cgroupPaths,
cgroupManager: cgroupManager,
storageDriver: storageDriver,
fsInfo: fsInfo,
rootFs: rootFs,
rootfsStorageDir: rootfsStorageDir,
envs: make(map[string]string),
ignoreMetrics: ignoreMetrics,
}
handler.creationTime = time.Unix(0, cInfo.CreatedTime)
handler.pid = cInfo.Pid
handler.aliases = append(handler.aliases, cInfo.Name, id)
handler.labels = cInfo.Labels
handler.image = cInfo.Image
// TODO: we wantd to know graph driver DeviceId (dont think this is needed now)
// ignore err and get zero as default, this happens with sandboxes, not sure why...
// kube isn't sending restart count in labels for sandboxes.
restartCount, _ := strconv.Atoi(cInfo.Annotations["io.kubernetes.container.restartCount"])
handler.restartCount = restartCount
handler.ipAddress = cInfo.IP
// we optionally collect disk usage metrics
if !ignoreMetrics.Has(container.DiskUsageMetrics) {
handler.fsHandler = common.NewFsHandler(common.DefaultPeriod, rootfsStorageDir, storageLogDir, fsInfo)
}
// TODO for env vars we wanted to show from container.Config.Env from whitelist
//for _, exposedEnv := range metadataEnvs {
//glog.Infof("TODO env whitelist: %v", exposedEnv)
//}
return handler, nil
}
func (self *crioContainerHandler) Start() {
if self.fsHandler != nil {
self.fsHandler.Start()
}
}
func (self *crioContainerHandler) Cleanup() {
if self.fsHandler != nil {
self.fsHandler.Stop()
}
}
func (self *crioContainerHandler) ContainerReference() (info.ContainerReference, error) {
return info.ContainerReference{
Id: self.id,
Name: self.name,
Aliases: self.aliases,
Namespace: CrioNamespace,
Labels: self.labels,
}, nil
}
func (self *crioContainerHandler) needNet() bool {
if !self.ignoreMetrics.Has(container.NetworkUsageMetrics) {
return self.labels["io.kubernetes.container.name"] == "POD"
}
return false
}
func (self *crioContainerHandler) GetSpec() (info.ContainerSpec, error) {
hasFilesystem := !self.ignoreMetrics.Has(container.DiskUsageMetrics)
spec, err := common.GetSpec(self.cgroupPaths, self.machineInfoFactory, self.needNet(), hasFilesystem)
spec.Labels = self.labels
// Only adds restartcount label if it's greater than 0
if self.restartCount > 0 {
spec.Labels["restartcount"] = strconv.Itoa(self.restartCount)
}
spec.Envs = self.envs
spec.Image = self.image
return spec, err
}
func (self *crioContainerHandler) getFsStats(stats *info.ContainerStats) error {
mi, err := self.machineInfoFactory.GetMachineInfo()
if err != nil {
return err
}
if !self.ignoreMetrics.Has(container.DiskIOMetrics) {
common.AssignDeviceNamesToDiskStats((*common.MachineInfoNamer)(mi), &stats.DiskIo)
}
if self.ignoreMetrics.Has(container.DiskUsageMetrics) {
return nil
}
var device string
switch self.storageDriver {
case overlay2StorageDriver, overlayStorageDriver:
deviceInfo, err := self.fsInfo.GetDirFsDevice(self.rootfsStorageDir)
if err != nil {
return fmt.Errorf("unable to determine device info for dir: %v: %v", self.rootfsStorageDir, err)
}
device = deviceInfo.Device
default:
return nil
}
var (
limit uint64
fsType string
)
// crio does not impose any filesystem limits for containers. So use capacity as limit.
for _, fs := range mi.Filesystems {
if fs.Device == device {
limit = fs.Capacity
fsType = fs.Type
break
}
}
fsStat := info.FsStats{Device: device, Type: fsType, Limit: limit}
usage := self.fsHandler.Usage()
fsStat.BaseUsage = usage.BaseUsageBytes
fsStat.Usage = usage.TotalUsageBytes
fsStat.Inodes = usage.InodeUsage
stats.Filesystem = append(stats.Filesystem, fsStat)
return nil
}
func (self *crioContainerHandler) GetStats() (*info.ContainerStats, error) {
stats, err := containerlibcontainer.GetStats(self.cgroupManager, self.rootFs, self.pid, self.ignoreMetrics)
if err != nil {
return stats, err
}
// Clean up stats for containers that don't have their own network - this
// includes containers running in Kubernetes pods that use the network of the
// infrastructure container. This stops metrics being reported multiple times
// for each container in a pod.
if !self.needNet() {
stats.Network = info.NetworkStats{}
}
// Get filesystem stats.
err = self.getFsStats(stats)
if err != nil {
return stats, err
}
return stats, nil
}
func (self *crioContainerHandler) ListContainers(listType container.ListType) ([]info.ContainerReference, error) {
// No-op for Docker driver.
return []info.ContainerReference{}, nil
}
func (self *crioContainerHandler) GetCgroupPath(resource string) (string, error) {
path, ok := self.cgroupPaths[resource]
if !ok {
return "", fmt.Errorf("could not find path for resource %q for container %q\n", resource, self.name)
}
return path, nil
}
func (self *crioContainerHandler) GetContainerLabels() map[string]string {
return self.labels
}
func (self *crioContainerHandler) GetContainerIPAddress() string {
return self.ipAddress
}
func (self *crioContainerHandler) ListProcesses(listType container.ListType) ([]int, error) {
return containerlibcontainer.GetProcesses(self.cgroupManager)
}
func (self *crioContainerHandler) Exists() bool {
return common.CgroupExists(self.cgroupPaths)
}
func (self *crioContainerHandler) Type() container.ContainerType {
return container.ContainerTypeCrio
}
vendor/github.com/google/cadvisor/fs/fs.go
View file @ e740e426
...@@ -43,6 +43,7 @@ const ( ...@@ -43,6 +43,7 @@ const (
LabelSystemRoot = "root" LabelSystemRoot = "root"
LabelDockerImages = "docker-images" LabelDockerImages = "docker-images"
LabelRktImages = "rkt-images" LabelRktImages = "rkt-images"
LabelCrioImages = "crio-images"
) )
// The maximum number of `du` and `find` tasks that can be running at once. // The maximum number of `du` and `find` tasks that can be running at once.
...@@ -91,6 +92,7 @@ type Context struct { ...@@ -91,6 +92,7 @@ type Context struct {
// docker root directory. // docker root directory.
Docker DockerContext Docker DockerContext
RktPath string RktPath string
Crio CrioContext
} }
type DockerContext struct { type DockerContext struct {
...@@ -99,6 +101,10 @@ type DockerContext struct { ...@@ -99,6 +101,10 @@ type DockerContext struct {
DriverStatus map[string]string DriverStatus map[string]string
} }
type CrioContext struct {
Root string
}
func NewFsInfo(context Context) (FsInfo, error) { func NewFsInfo(context Context) (FsInfo, error) {
mounts, err := mount.GetMounts() mounts, err := mount.GetMounts()
if err != nil { if err != nil {
...@@ -128,6 +134,7 @@ func NewFsInfo(context Context) (FsInfo, error) { ...@@ -128,6 +134,7 @@ func NewFsInfo(context Context) (FsInfo, error) {
// 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
fsInfo.addDockerImagesLabel(context, mounts) fsInfo.addDockerImagesLabel(context, mounts)
fsInfo.addCrioImagesLabel(context, mounts)
glog.Infof("Filesystem UUIDs: %+v", fsInfo.fsUUIDToDeviceName) glog.Infof("Filesystem UUIDs: %+v", fsInfo.fsUUIDToDeviceName)
glog.Infof("Filesystem partitions: %+v", fsInfo.partitions) glog.Infof("Filesystem partitions: %+v", fsInfo.partitions)
...@@ -278,6 +285,23 @@ func (self *RealFsInfo) addDockerImagesLabel(context Context, mounts []*mount.In ...@@ -278,6 +285,23 @@ func (self *RealFsInfo) addDockerImagesLabel(context Context, mounts []*mount.In
} }
} }
func (self *RealFsInfo) addCrioImagesLabel(context Context, mounts []*mount.Info) {
if context.Crio.Root != "" {
crioPath := context.Crio.Root
crioImagePaths := map[string]struct{}{
"/": {},
}
for _, dir := range []string{"overlay", "overlay2"} {
crioImagePaths[path.Join(crioPath, dir+"-images")] = struct{}{}
}
for crioPath != "/" && crioPath != "." {
crioImagePaths[crioPath] = struct{}{}
crioPath = filepath.Dir(crioPath)
}
self.updateContainerImagesPath(LabelCrioImages, mounts, crioImagePaths)
}
}
func (self *RealFsInfo) addRktImagesLabel(context Context, mounts []*mount.Info) { func (self *RealFsInfo) addRktImagesLabel(context Context, mounts []*mount.Info) {
if context.RktPath != "" { if context.RktPath != "" {
rktPath := context.RktPath rktPath := context.RktPath
......
vendor/github.com/google/cadvisor/manager/BUILD
View file @ e740e426
...@@ -13,6 +13,7 @@ go_library( ...@@ -13,6 +13,7 @@ go_library(
"//vendor/github.com/google/cadvisor/cache/memory:go_default_library", "//vendor/github.com/google/cadvisor/cache/memory:go_default_library",
"//vendor/github.com/google/cadvisor/collector:go_default_library", "//vendor/github.com/google/cadvisor/collector:go_default_library",
"//vendor/github.com/google/cadvisor/container:go_default_library", "//vendor/github.com/google/cadvisor/container:go_default_library",
"//vendor/github.com/google/cadvisor/container/crio:go_default_library",
"//vendor/github.com/google/cadvisor/container/docker:go_default_library", "//vendor/github.com/google/cadvisor/container/docker:go_default_library",
"//vendor/github.com/google/cadvisor/container/raw:go_default_library", "//vendor/github.com/google/cadvisor/container/raw:go_default_library",
"//vendor/github.com/google/cadvisor/container/rkt:go_default_library", "//vendor/github.com/google/cadvisor/container/rkt:go_default_library",
......
vendor/github.com/google/cadvisor/manager/manager.go
View file @ e740e426
...@@ -28,6 +28,7 @@ import ( ...@@ -28,6 +28,7 @@ import (
"github.com/google/cadvisor/cache/memory" "github.com/google/cadvisor/cache/memory"
"github.com/google/cadvisor/collector" "github.com/google/cadvisor/collector"
"github.com/google/cadvisor/container" "github.com/google/cadvisor/container"
"github.com/google/cadvisor/container/crio"
"github.com/google/cadvisor/container/docker" "github.com/google/cadvisor/container/docker"
"github.com/google/cadvisor/container/raw" "github.com/google/cadvisor/container/raw"
"github.com/google/cadvisor/container/rkt" "github.com/google/cadvisor/container/rkt"
...@@ -156,6 +157,15 @@ func New(memoryCache *memory.InMemoryCache, sysfs sysfs.SysFs, maxHousekeepingIn ...@@ -156,6 +157,15 @@ func New(memoryCache *memory.InMemoryCache, sysfs sysfs.SysFs, maxHousekeepingIn
glog.Warningf("unable to connect to Rkt api service: %v", err) glog.Warningf("unable to connect to Rkt api service: %v", err)
} }
crioClient, err := crio.Client()
if err != nil {
return nil, err
}
crioInfo, err := crioClient.Info()
if err != nil {
glog.Warningf("unable to connect to CRI-O api service: %v", err)
}
context := fs.Context{ context := fs.Context{
Docker: fs.DockerContext{ Docker: fs.DockerContext{
Root: docker.RootDir(), Root: docker.RootDir(),
...@@ -163,6 +173,9 @@ func New(memoryCache *memory.InMemoryCache, sysfs sysfs.SysFs, maxHousekeepingIn ...@@ -163,6 +173,9 @@ func New(memoryCache *memory.InMemoryCache, sysfs sysfs.SysFs, maxHousekeepingIn
DriverStatus: dockerStatus.DriverStatus, DriverStatus: dockerStatus.DriverStatus,
}, },
RktPath: rktPath, RktPath: rktPath,
Crio: fs.CrioContext{
Root: crioInfo.StorageRoot,
},
} }
fsInfo, err := fs.NewFsInfo(context) fsInfo, err := fs.NewFsInfo(context)
if err != nil { if err != nil {
...@@ -258,6 +271,11 @@ func (self *manager) Start() error { ...@@ -258,6 +271,11 @@ func (self *manager) Start() error {
self.containerWatchers = append(self.containerWatchers, watcher) self.containerWatchers = append(self.containerWatchers, watcher)
} }
err = crio.Register(self, self.fsInfo, self.ignoreMetrics)
if err != nil {
glog.Warningf("Registration of the crio container factory failed: %v", err)
}
err = systemd.Register(self, self.fsInfo, self.ignoreMetrics) err = systemd.Register(self, self.fsInfo, self.ignoreMetrics)
if err != nil { if err != nil {
glog.Warningf("Registration of the systemd container factory failed: %v", err) glog.Warningf("Registration of the systemd container factory failed: %v", err)
......
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