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

updated cadvisor version

Browse Source
This commit is contained in:
bindata-mockuser 2016-08-02 16:01:00 -07:00
parent fa5f3b816e
commit e00a35ccad
18 changed files with 211 additions and 161 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

160
Godeps/Godeps.json generated
View File

@ -1035,203 +1035,203 @@
}, },
{ {
"ImportPath": "github.com/google/cadvisor/api", "ImportPath": "github.com/google/cadvisor/api",
"Comment": "v0.23.2-63-ge47efa0", "Comment": "v0.23.2-79-gc6c06d4",
"Rev": "e47efa0e8af65e9a2a2eb2ce955e156eac067852" "Rev": "c6c06d440ab2fcaae9211dda6dcbbaa1e98a054b"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/cache/memory", "ImportPath": "github.com/google/cadvisor/cache/memory",
"Comment": "v0.23.2-63-ge47efa0", "Comment": "v0.23.2-79-gc6c06d4",
"Rev": "e47efa0e8af65e9a2a2eb2ce955e156eac067852" "Rev": "c6c06d440ab2fcaae9211dda6dcbbaa1e98a054b"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/collector", "ImportPath": "github.com/google/cadvisor/collector",
"Comment": "v0.23.2-63-ge47efa0", "Comment": "v0.23.2-79-gc6c06d4",
"Rev": "e47efa0e8af65e9a2a2eb2ce955e156eac067852" "Rev": "c6c06d440ab2fcaae9211dda6dcbbaa1e98a054b"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/container", "ImportPath": "github.com/google/cadvisor/container",
"Comment": "v0.23.2-63-ge47efa0", "Comment": "v0.23.2-79-gc6c06d4",
"Rev": "e47efa0e8af65e9a2a2eb2ce955e156eac067852" "Rev": "c6c06d440ab2fcaae9211dda6dcbbaa1e98a054b"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/container/common", "ImportPath": "github.com/google/cadvisor/container/common",
"Comment": "v0.23.2-63-ge47efa0", "Comment": "v0.23.2-79-gc6c06d4",
"Rev": "e47efa0e8af65e9a2a2eb2ce955e156eac067852" "Rev": "c6c06d440ab2fcaae9211dda6dcbbaa1e98a054b"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/container/docker", "ImportPath": "github.com/google/cadvisor/container/docker",
"Comment": "v0.23.2-63-ge47efa0", "Comment": "v0.23.2-79-gc6c06d4",
"Rev": "e47efa0e8af65e9a2a2eb2ce955e156eac067852" "Rev": "c6c06d440ab2fcaae9211dda6dcbbaa1e98a054b"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/container/libcontainer", "ImportPath": "github.com/google/cadvisor/container/libcontainer",
"Comment": "v0.23.2-63-ge47efa0", "Comment": "v0.23.2-79-gc6c06d4",
"Rev": "e47efa0e8af65e9a2a2eb2ce955e156eac067852" "Rev": "c6c06d440ab2fcaae9211dda6dcbbaa1e98a054b"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/container/raw", "ImportPath": "github.com/google/cadvisor/container/raw",
"Comment": "v0.23.2-63-ge47efa0", "Comment": "v0.23.2-79-gc6c06d4",
"Rev": "e47efa0e8af65e9a2a2eb2ce955e156eac067852" "Rev": "c6c06d440ab2fcaae9211dda6dcbbaa1e98a054b"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/container/rkt", "ImportPath": "github.com/google/cadvisor/container/rkt",
"Comment": "v0.23.2-63-ge47efa0", "Comment": "v0.23.2-79-gc6c06d4",
"Rev": "e47efa0e8af65e9a2a2eb2ce955e156eac067852" "Rev": "c6c06d440ab2fcaae9211dda6dcbbaa1e98a054b"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/container/systemd", "ImportPath": "github.com/google/cadvisor/container/systemd",
"Comment": "v0.23.2-63-ge47efa0", "Comment": "v0.23.2-79-gc6c06d4",
"Rev": "e47efa0e8af65e9a2a2eb2ce955e156eac067852" "Rev": "c6c06d440ab2fcaae9211dda6dcbbaa1e98a054b"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/devicemapper", "ImportPath": "github.com/google/cadvisor/devicemapper",
"Comment": "v0.23.2-63-ge47efa0", "Comment": "v0.23.2-79-gc6c06d4",
"Rev": "e47efa0e8af65e9a2a2eb2ce955e156eac067852" "Rev": "c6c06d440ab2fcaae9211dda6dcbbaa1e98a054b"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/events", "ImportPath": "github.com/google/cadvisor/events",
"Comment": "v0.23.2-63-ge47efa0", "Comment": "v0.23.2-79-gc6c06d4",
"Rev": "e47efa0e8af65e9a2a2eb2ce955e156eac067852" "Rev": "c6c06d440ab2fcaae9211dda6dcbbaa1e98a054b"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/fs", "ImportPath": "github.com/google/cadvisor/fs",
"Comment": "v0.23.2-63-ge47efa0", "Comment": "v0.23.2-79-gc6c06d4",
"Rev": "e47efa0e8af65e9a2a2eb2ce955e156eac067852" "Rev": "c6c06d440ab2fcaae9211dda6dcbbaa1e98a054b"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/healthz", "ImportPath": "github.com/google/cadvisor/healthz",
"Comment": "v0.23.2-63-ge47efa0", "Comment": "v0.23.2-79-gc6c06d4",
"Rev": "e47efa0e8af65e9a2a2eb2ce955e156eac067852" "Rev": "c6c06d440ab2fcaae9211dda6dcbbaa1e98a054b"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/http", "ImportPath": "github.com/google/cadvisor/http",
"Comment": "v0.23.2-63-ge47efa0", "Comment": "v0.23.2-79-gc6c06d4",
"Rev": "e47efa0e8af65e9a2a2eb2ce955e156eac067852" "Rev": "c6c06d440ab2fcaae9211dda6dcbbaa1e98a054b"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/http/mux", "ImportPath": "github.com/google/cadvisor/http/mux",
"Comment": "v0.23.2-63-ge47efa0", "Comment": "v0.23.2-79-gc6c06d4",
"Rev": "e47efa0e8af65e9a2a2eb2ce955e156eac067852" "Rev": "c6c06d440ab2fcaae9211dda6dcbbaa1e98a054b"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/info/v1", "ImportPath": "github.com/google/cadvisor/info/v1",
"Comment": "v0.23.2-63-ge47efa0", "Comment": "v0.23.2-79-gc6c06d4",
"Rev": "e47efa0e8af65e9a2a2eb2ce955e156eac067852" "Rev": "c6c06d440ab2fcaae9211dda6dcbbaa1e98a054b"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/info/v1/test", "ImportPath": "github.com/google/cadvisor/info/v1/test",
"Comment": "v0.23.2-63-ge47efa0", "Comment": "v0.23.2-79-gc6c06d4",
"Rev": "e47efa0e8af65e9a2a2eb2ce955e156eac067852" "Rev": "c6c06d440ab2fcaae9211dda6dcbbaa1e98a054b"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/info/v2", "ImportPath": "github.com/google/cadvisor/info/v2",
"Comment": "v0.23.2-63-ge47efa0", "Comment": "v0.23.2-79-gc6c06d4",
"Rev": "e47efa0e8af65e9a2a2eb2ce955e156eac067852" "Rev": "c6c06d440ab2fcaae9211dda6dcbbaa1e98a054b"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/machine", "ImportPath": "github.com/google/cadvisor/machine",
"Comment": "v0.23.2-63-ge47efa0", "Comment": "v0.23.2-79-gc6c06d4",
"Rev": "e47efa0e8af65e9a2a2eb2ce955e156eac067852" "Rev": "c6c06d440ab2fcaae9211dda6dcbbaa1e98a054b"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/manager", "ImportPath": "github.com/google/cadvisor/manager",
"Comment": "v0.23.2-63-ge47efa0", "Comment": "v0.23.2-79-gc6c06d4",
"Rev": "e47efa0e8af65e9a2a2eb2ce955e156eac067852" "Rev": "c6c06d440ab2fcaae9211dda6dcbbaa1e98a054b"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/manager/watcher", "ImportPath": "github.com/google/cadvisor/manager/watcher",
"Comment": "v0.23.2-63-ge47efa0", "Comment": "v0.23.2-79-gc6c06d4",
"Rev": "e47efa0e8af65e9a2a2eb2ce955e156eac067852" "Rev": "c6c06d440ab2fcaae9211dda6dcbbaa1e98a054b"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/manager/watcher/raw", "ImportPath": "github.com/google/cadvisor/manager/watcher/raw",
"Comment": "v0.23.2-63-ge47efa0", "Comment": "v0.23.2-79-gc6c06d4",
"Rev": "e47efa0e8af65e9a2a2eb2ce955e156eac067852" "Rev": "c6c06d440ab2fcaae9211dda6dcbbaa1e98a054b"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/manager/watcher/rkt", "ImportPath": "github.com/google/cadvisor/manager/watcher/rkt",
"Comment": "v0.23.2-63-ge47efa0", "Comment": "v0.23.2-79-gc6c06d4",
"Rev": "e47efa0e8af65e9a2a2eb2ce955e156eac067852" "Rev": "c6c06d440ab2fcaae9211dda6dcbbaa1e98a054b"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/metrics", "ImportPath": "github.com/google/cadvisor/metrics",
"Comment": "v0.23.2-63-ge47efa0", "Comment": "v0.23.2-79-gc6c06d4",
"Rev": "e47efa0e8af65e9a2a2eb2ce955e156eac067852" "Rev": "c6c06d440ab2fcaae9211dda6dcbbaa1e98a054b"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/pages", "ImportPath": "github.com/google/cadvisor/pages",
"Comment": "v0.23.2-63-ge47efa0", "Comment": "v0.23.2-79-gc6c06d4",
"Rev": "e47efa0e8af65e9a2a2eb2ce955e156eac067852" "Rev": "c6c06d440ab2fcaae9211dda6dcbbaa1e98a054b"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/pages/static", "ImportPath": "github.com/google/cadvisor/pages/static",
"Comment": "v0.23.2-63-ge47efa0", "Comment": "v0.23.2-79-gc6c06d4",
"Rev": "e47efa0e8af65e9a2a2eb2ce955e156eac067852" "Rev": "c6c06d440ab2fcaae9211dda6dcbbaa1e98a054b"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/storage", "ImportPath": "github.com/google/cadvisor/storage",
"Comment": "v0.23.2-63-ge47efa0", "Comment": "v0.23.2-79-gc6c06d4",
"Rev": "e47efa0e8af65e9a2a2eb2ce955e156eac067852" "Rev": "c6c06d440ab2fcaae9211dda6dcbbaa1e98a054b"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/summary", "ImportPath": "github.com/google/cadvisor/summary",
"Comment": "v0.23.2-63-ge47efa0", "Comment": "v0.23.2-79-gc6c06d4",
"Rev": "e47efa0e8af65e9a2a2eb2ce955e156eac067852" "Rev": "c6c06d440ab2fcaae9211dda6dcbbaa1e98a054b"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/utils", "ImportPath": "github.com/google/cadvisor/utils",
"Comment": "v0.23.2-63-ge47efa0", "Comment": "v0.23.2-79-gc6c06d4",
"Rev": "e47efa0e8af65e9a2a2eb2ce955e156eac067852" "Rev": "c6c06d440ab2fcaae9211dda6dcbbaa1e98a054b"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/utils/cloudinfo", "ImportPath": "github.com/google/cadvisor/utils/cloudinfo",
"Comment": "v0.23.2-63-ge47efa0", "Comment": "v0.23.2-79-gc6c06d4",
"Rev": "e47efa0e8af65e9a2a2eb2ce955e156eac067852" "Rev": "c6c06d440ab2fcaae9211dda6dcbbaa1e98a054b"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/utils/cpuload", "ImportPath": "github.com/google/cadvisor/utils/cpuload",
"Comment": "v0.23.2-63-ge47efa0", "Comment": "v0.23.2-79-gc6c06d4",
"Rev": "e47efa0e8af65e9a2a2eb2ce955e156eac067852" "Rev": "c6c06d440ab2fcaae9211dda6dcbbaa1e98a054b"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/utils/cpuload/netlink", "ImportPath": "github.com/google/cadvisor/utils/cpuload/netlink",
"Comment": "v0.23.2-63-ge47efa0", "Comment": "v0.23.2-79-gc6c06d4",
"Rev": "e47efa0e8af65e9a2a2eb2ce955e156eac067852" "Rev": "c6c06d440ab2fcaae9211dda6dcbbaa1e98a054b"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/utils/docker", "ImportPath": "github.com/google/cadvisor/utils/docker",
"Comment": "v0.23.2-63-ge47efa0", "Comment": "v0.23.2-79-gc6c06d4",
"Rev": "e47efa0e8af65e9a2a2eb2ce955e156eac067852" "Rev": "c6c06d440ab2fcaae9211dda6dcbbaa1e98a054b"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/utils/oomparser", "ImportPath": "github.com/google/cadvisor/utils/oomparser",
"Comment": "v0.23.2-63-ge47efa0", "Comment": "v0.23.2-79-gc6c06d4",
"Rev": "e47efa0e8af65e9a2a2eb2ce955e156eac067852" "Rev": "c6c06d440ab2fcaae9211dda6dcbbaa1e98a054b"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/utils/sysfs", "ImportPath": "github.com/google/cadvisor/utils/sysfs",
"Comment": "v0.23.2-63-ge47efa0", "Comment": "v0.23.2-79-gc6c06d4",
"Rev": "e47efa0e8af65e9a2a2eb2ce955e156eac067852" "Rev": "c6c06d440ab2fcaae9211dda6dcbbaa1e98a054b"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/utils/sysinfo", "ImportPath": "github.com/google/cadvisor/utils/sysinfo",
"Comment": "v0.23.2-63-ge47efa0", "Comment": "v0.23.2-79-gc6c06d4",
"Rev": "e47efa0e8af65e9a2a2eb2ce955e156eac067852" "Rev": "c6c06d440ab2fcaae9211dda6dcbbaa1e98a054b"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/utils/tail", "ImportPath": "github.com/google/cadvisor/utils/tail",
"Comment": "v0.23.2-63-ge47efa0", "Comment": "v0.23.2-79-gc6c06d4",
"Rev": "e47efa0e8af65e9a2a2eb2ce955e156eac067852" "Rev": "c6c06d440ab2fcaae9211dda6dcbbaa1e98a054b"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/validate", "ImportPath": "github.com/google/cadvisor/validate",
"Comment": "v0.23.2-63-ge47efa0", "Comment": "v0.23.2-79-gc6c06d4",
"Rev": "e47efa0e8af65e9a2a2eb2ce955e156eac067852" "Rev": "c6c06d440ab2fcaae9211dda6dcbbaa1e98a054b"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/version", "ImportPath": "github.com/google/cadvisor/version",
"Comment": "v0.23.2-63-ge47efa0", "Comment": "v0.23.2-79-gc6c06d4",
"Rev": "e47efa0e8af65e9a2a2eb2ce955e156eac067852" "Rev": "c6c06d440ab2fcaae9211dda6dcbbaa1e98a054b"
}, },
{ {
"ImportPath": "github.com/google/certificate-transparency/go", "ImportPath": "github.com/google/certificate-transparency/go",

2
pkg/kubelet/cadvisor/cadvisor_linux.go
View File

@ -78,7 +78,7 @@ func New(port uint, runtime string) (Interface, error) {
} }
// Create and start the cAdvisor container manager. // Create and start the cAdvisor container manager.
m, err := manager.New(memory.New(statsCacheDuration, nil), sysFs, maxHousekeepingInterval, allowDynamicHousekeeping, cadvisorMetrics.MetricSet{cadvisorMetrics.NetworkTcpUsageMetrics: struct{}{}}) m, err := manager.New(memory.New(statsCacheDuration, nil), sysFs, maxHousekeepingInterval, allowDynamicHousekeeping, cadvisorMetrics.MetricSet{cadvisorMetrics.NetworkTcpUsageMetrics: struct{}{}}, http.DefaultClient)
if err != nil { if err != nil {
return nil, err return nil, err
} }

8
pkg/kubelet/server/stats/summary.go
View File

@ -125,14 +125,14 @@ func (sb *summaryBuilder) build() (*stats.Summary, error) {
AvailableBytes: &sb.rootFsInfo.Available, AvailableBytes: &sb.rootFsInfo.Available,
CapacityBytes: &sb.rootFsInfo.Capacity, CapacityBytes: &sb.rootFsInfo.Capacity,
UsedBytes: &sb.rootFsInfo.Usage, UsedBytes: &sb.rootFsInfo.Usage,
InodesFree: &sb.rootFsInfo.InodesFree}, InodesFree: sb.rootFsInfo.InodesFree},
StartTime: rootStats.StartTime, StartTime: rootStats.StartTime,
Runtime: &stats.RuntimeStats{ Runtime: &stats.RuntimeStats{
ImageFs: &stats.FsStats{ ImageFs: &stats.FsStats{
AvailableBytes: &sb.imageFsInfo.Available, AvailableBytes: &sb.imageFsInfo.Available,
CapacityBytes: &sb.imageFsInfo.Capacity, CapacityBytes: &sb.imageFsInfo.Capacity,
UsedBytes: &sb.imageStats.TotalStorageBytes, UsedBytes: &sb.imageStats.TotalStorageBytes,
InodesFree: &sb.imageFsInfo.InodesFree, InodesFree: sb.imageFsInfo.InodesFree,
}, },
}, },
} }
@ -164,14 +164,14 @@ func (sb *summaryBuilder) containerInfoV2FsStats(
cs.Logs = &stats.FsStats{ cs.Logs = &stats.FsStats{
AvailableBytes: &sb.rootFsInfo.Available, AvailableBytes: &sb.rootFsInfo.Available,
CapacityBytes: &sb.rootFsInfo.Capacity, CapacityBytes: &sb.rootFsInfo.Capacity,
InodesFree: &sb.rootFsInfo.InodesFree, InodesFree: sb.rootFsInfo.InodesFree,
} }
// The container rootFs lives on the imageFs devices (which may not be the node root fs) // The container rootFs lives on the imageFs devices (which may not be the node root fs)
cs.Rootfs = &stats.FsStats{ cs.Rootfs = &stats.FsStats{
AvailableBytes: &sb.imageFsInfo.Available, AvailableBytes: &sb.imageFsInfo.Available,
CapacityBytes: &sb.imageFsInfo.Capacity, CapacityBytes: &sb.imageFsInfo.Capacity,
InodesFree: &sb.imageFsInfo.InodesFree, InodesFree: sb.imageFsInfo.InodesFree,
} }
lcs, found := sb.latestContainerStats(info) lcs, found := sb.latestContainerStats(info)
if !found { if !found {

6
pkg/kubelet/server/stats/summary_test.go
View File

@ -118,15 +118,17 @@ func TestBuildSummary(t *testing.T) {
"/pod2-c0": summaryTestContainerInfo(seedPod2Container, pName2, namespace2, cName20), "/pod2-c0": summaryTestContainerInfo(seedPod2Container, pName2, namespace2, cName20),
} }
freeRootfsInodes := rootfsInodesFree
rootfs := v2.FsInfo{ rootfs := v2.FsInfo{
Capacity: rootfsCapacity, Capacity: rootfsCapacity,
Available: rootfsAvailable, Available: rootfsAvailable,
InodesFree: rootfsInodesFree, InodesFree: &freeRootfsInodes,
} }
freeImagefsInodes := imagefsInodesFree
imagefs := v2.FsInfo{ imagefs := v2.FsInfo{
Capacity: imagefsCapacity, Capacity: imagefsCapacity,
Available: imagefsAvailable, Available: imagefsAvailable,
InodesFree: imagefsInodesFree, InodesFree: &freeImagefsInodes,
} }
// memory limit overrides for each container (used to test available bytes if a memory limit is known) // memory limit overrides for each container (used to test available bytes if a memory limit is known)

8
vendor/github.com/google/cadvisor/collector/generic_collector.go generated vendored
View File

@ -37,6 +37,9 @@ type GenericCollector struct {
//holds information necessary to extract metrics //holds information necessary to extract metrics
info *collectorInfo info *collectorInfo
// The Http client to use when connecting to metric endpoints
httpClient *http.Client
} }
type collectorInfo struct { type collectorInfo struct {
@ -52,7 +55,7 @@ type collectorInfo struct {
} }
//Returns a new collector using the information extracted from the configfile //Returns a new collector using the information extracted from the configfile
func NewCollector(collectorName string, configFile []byte, metricCountLimit int, containerHandler container.ContainerHandler) (*GenericCollector, error) { func NewCollector(collectorName string, configFile []byte, metricCountLimit int, containerHandler container.ContainerHandler, httpClient *http.Client) (*GenericCollector, error) {
var configInJSON Config var configInJSON Config
err := json.Unmarshal(configFile, &configInJSON) err := json.Unmarshal(configFile, &configInJSON)
if err != nil { if err != nil {
@ -102,6 +105,7 @@ func NewCollector(collectorName string, configFile []byte, metricCountLimit int,
regexps: regexprs, regexps: regexprs,
metricCountLimit: metricCountLimit, metricCountLimit: metricCountLimit,
}, },
httpClient: httpClient,
}, nil }, nil
} }
@ -134,7 +138,7 @@ func (collector *GenericCollector) Collect(metrics map[string][]v1.MetricVal) (t
nextCollectionTime := currentTime.Add(time.Duration(collector.info.minPollingFrequency)) nextCollectionTime := currentTime.Add(time.Duration(collector.info.minPollingFrequency))
uri := collector.configFile.Endpoint.URL uri := collector.configFile.Endpoint.URL
response, err := http.Get(uri) response, err := collector.httpClient.Get(uri)
if err != nil { if err != nil {
return nextCollectionTime, nil, err return nextCollectionTime, nil, err
} }

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

@ -44,10 +44,13 @@ type PrometheusCollector struct {
// Limit for the number of scaped metrics. If the count is higher, // Limit for the number of scaped metrics. If the count is higher,
// no metrics will be returned. // no metrics will be returned.
metricCountLimit int metricCountLimit int
// The Http client to use when connecting to metric endpoints
httpClient *http.Client
} }
//Returns a new collector using the information extracted from the configfile //Returns a new collector using the information extracted from the configfile
func NewPrometheusCollector(collectorName string, configFile []byte, metricCountLimit int, containerHandler container.ContainerHandler) (*PrometheusCollector, error) { func NewPrometheusCollector(collectorName string, configFile []byte, metricCountLimit int, containerHandler container.ContainerHandler, httpClient *http.Client) (*PrometheusCollector, error) {
var configInJSON Prometheus var configInJSON Prometheus
err := json.Unmarshal(configFile, &configInJSON) err := json.Unmarshal(configFile, &configInJSON)
if err != nil { if err != nil {
@ -88,6 +91,7 @@ func NewPrometheusCollector(collectorName string, configFile []byte, metricCount
configFile: configInJSON, configFile: configInJSON,
metricsSet: metricsSet, metricsSet: metricsSet,
metricCountLimit: metricCountLimit, metricCountLimit: metricCountLimit,
httpClient: httpClient,
}, nil }, nil
} }
@ -111,7 +115,8 @@ func getMetricData(line string) string {
func (collector *PrometheusCollector) GetSpec() []v1.MetricSpec { func (collector *PrometheusCollector) GetSpec() []v1.MetricSpec {
specs := []v1.MetricSpec{} specs := []v1.MetricSpec{}
response, err := http.Get(collector.configFile.Endpoint.URL)
response, err := collector.httpClient.Get(collector.configFile.Endpoint.URL)
if err != nil { if err != nil {
return specs return specs
} }
@ -157,7 +162,7 @@ func (collector *PrometheusCollector) Collect(metrics map[string][]v1.MetricVal)
nextCollectionTime := currentTime.Add(time.Duration(collector.pollingFrequency)) nextCollectionTime := currentTime.Add(time.Duration(collector.pollingFrequency))
uri := collector.configFile.Endpoint.URL uri := collector.configFile.Endpoint.URL
response, err := http.Get(uri) response, err := collector.httpClient.Get(uri)
if err != nil { if err != nil {
return nextCollectionTime, nil, err return nextCollectionTime, nil, err
} }

5
vendor/github.com/google/cadvisor/container/docker/handler.go generated vendored
View File

@ -294,7 +294,10 @@ func (h *dockerFsHandler) Usage() (uint64, uint64) {
if h.thinPoolWatcher != nil { if h.thinPoolWatcher != nil {
thinPoolUsage, err := h.thinPoolWatcher.GetUsage(h.deviceID) thinPoolUsage, err := h.thinPoolWatcher.GetUsage(h.deviceID)
if err != nil { if err != nil {
glog.Errorf("unable to get fs usage from thin pool for device %v: %v", h.deviceID, err) // TODO: ideally we should keep track of how many times we failed to get the usage for this
// device vs how many refreshes of the cache there have been, and display an error e.g. if we've
// had at least 1 refresh and we still can't find the device.
glog.V(5).Infof("unable to get fs usage from thin pool for device %s: %v", h.deviceID, err)
} else { } else {
baseUsage = thinPoolUsage baseUsage = thinPoolUsage
usage += thinPoolUsage usage += thinPoolUsage

78
vendor/github.com/google/cadvisor/container/raw/handler.go generated vendored
View File

@ -165,6 +165,37 @@ func (self *rawContainerHandler) GetSpec() (info.ContainerSpec, error) {
return spec, nil return spec, nil
} }
func fsToFsStats(fs *fs.Fs) info.FsStats {
inodes := uint64(0)
inodesFree := uint64(0)
hasInodes := fs.InodesFree != nil
if hasInodes {
inodes = *fs.Inodes
inodesFree = *fs.InodesFree
}
return info.FsStats{
Device: fs.Device,
Type: fs.Type.String(),
Limit: fs.Capacity,
Usage: fs.Capacity - fs.Free,
HasInodes: hasInodes,
Inodes: inodes,
InodesFree: inodesFree,
Available: fs.Available,
ReadsCompleted: fs.DiskStats.ReadsCompleted,
ReadsMerged: fs.DiskStats.ReadsMerged,
SectorsRead: fs.DiskStats.SectorsRead,
ReadTime: fs.DiskStats.ReadTime,
WritesCompleted: fs.DiskStats.WritesCompleted,
WritesMerged: fs.DiskStats.WritesMerged,
SectorsWritten: fs.DiskStats.SectorsWritten,
WriteTime: fs.DiskStats.WriteTime,
IoInProgress: fs.DiskStats.IoInProgress,
IoTime: fs.DiskStats.IoTime,
WeightedIoTime: fs.DiskStats.WeightedIoTime,
}
}
func (self *rawContainerHandler) getFsStats(stats *info.ContainerStats) error { func (self *rawContainerHandler) getFsStats(stats *info.ContainerStats) error {
// Get Filesystem information only for the root cgroup. // Get Filesystem information only for the root cgroup.
if isRootCgroup(self.name) { if isRootCgroup(self.name) {
@ -172,27 +203,9 @@ func (self *rawContainerHandler) getFsStats(stats *info.ContainerStats) error {
if err != nil { if err != nil {
return err return err
} }
for _, fs := range filesystems { for i := range filesystems {
stats.Filesystem = append(stats.Filesystem, fs := filesystems[i]
info.FsStats{ stats.Filesystem = append(stats.Filesystem, fsToFsStats(&fs))
Device: fs.Device,
Type: fs.Type.String(),
Limit: fs.Capacity,
Usage: fs.Capacity - fs.Free,
Available: fs.Available,
InodesFree: fs.InodesFree,
ReadsCompleted: fs.DiskStats.ReadsCompleted,
ReadsMerged: fs.DiskStats.ReadsMerged,
SectorsRead: fs.DiskStats.SectorsRead,
ReadTime: fs.DiskStats.ReadTime,
WritesCompleted: fs.DiskStats.WritesCompleted,
WritesMerged: fs.DiskStats.WritesMerged,
SectorsWritten: fs.DiskStats.SectorsWritten,
WriteTime: fs.DiskStats.WriteTime,
IoInProgress: fs.DiskStats.IoInProgress,
IoTime: fs.DiskStats.IoTime,
WeightedIoTime: fs.DiskStats.WeightedIoTime,
})
} }
} else if len(self.externalMounts) > 0 { } else if len(self.externalMounts) > 0 {
var mountSet map[string]struct{} var mountSet map[string]struct{}
@ -204,26 +217,9 @@ func (self *rawContainerHandler) getFsStats(stats *info.ContainerStats) error {
if err != nil { if err != nil {
return err return err
} }
for _, fs := range filesystems { for i := range filesystems {
stats.Filesystem = append(stats.Filesystem, fs := filesystems[i]
info.FsStats{ stats.Filesystem = append(stats.Filesystem, fsToFsStats(&fs))
Device: fs.Device,
Type: fs.Type.String(),
Limit: fs.Capacity,
Usage: fs.Capacity - fs.Free,
InodesFree: fs.InodesFree,
ReadsCompleted: fs.DiskStats.ReadsCompleted,
ReadsMerged: fs.DiskStats.ReadsMerged,
SectorsRead: fs.DiskStats.SectorsRead,
ReadTime: fs.DiskStats.ReadTime,
WritesCompleted: fs.DiskStats.WritesCompleted,
WritesMerged: fs.DiskStats.WritesMerged,
SectorsWritten: fs.DiskStats.SectorsWritten,
WriteTime: fs.DiskStats.WriteTime,
IoInProgress: fs.DiskStats.IoInProgress,
IoTime: fs.DiskStats.IoTime,
WeightedIoTime: fs.DiskStats.WeightedIoTime,
})
} }
} }
return nil return nil

6
vendor/github.com/google/cadvisor/devicemapper/thin_pool_watcher.go generated vendored
View File

@ -74,7 +74,7 @@ func (w *ThinPoolWatcher) Start() {
// print latency for refresh // print latency for refresh
duration := time.Since(start) duration := time.Since(start)
glog.V(3).Infof("thin_ls(%d) took %s", start.Unix(), duration) glog.V(5).Infof("thin_ls(%d) took %s", start.Unix(), duration)
} }
} }
} }
@ -115,7 +115,7 @@ func (w *ThinPoolWatcher) Refresh() error {
} }
if currentlyReserved { if currentlyReserved {
glog.V(4).Infof("metadata for %v is currently reserved; releasing", w.poolName) glog.V(5).Infof("metadata for %v is currently reserved; releasing", w.poolName)
_, err = w.dmsetup.Message(w.poolName, 0, releaseMetadataMessage) _, err = w.dmsetup.Message(w.poolName, 0, releaseMetadataMessage)
if err != nil { if err != nil {
err = fmt.Errorf("error releasing metadata snapshot for %v: %v", w.poolName, err) err = fmt.Errorf("error releasing metadata snapshot for %v: %v", w.poolName, err)
@ -123,7 +123,7 @@ func (w *ThinPoolWatcher) Refresh() error {
} }
} }
glog.Infof("reserving metadata snapshot for thin-pool %v", w.poolName) glog.V(5).Infof("reserving metadata snapshot for thin-pool %v", w.poolName)
// NOTE: "0" in the call below is for the 'sector' argument to 'dmsetup // NOTE: "0" in the call below is for the 'sector' argument to 'dmsetup
// message'. It's not needed for thin pools. // message'. It's not needed for thin pools.
if output, err := w.dmsetup.Message(w.poolName, 0, reserveMetadataMessage); err != nil { if output, err := w.dmsetup.Message(w.poolName, 0, reserveMetadataMessage); err != nil {

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

@ -322,7 +322,10 @@ func (self *RealFsInfo) GetFsInfoForPath(mountSet map[string]struct{}) ([]Fs, er
fs.Capacity, fs.Free, fs.Available, err = getZfstats(device) fs.Capacity, fs.Free, fs.Available, err = getZfstats(device)
fs.Type = ZFS fs.Type = ZFS
default: default:
fs.Capacity, fs.Free, fs.Available, fs.Inodes, fs.InodesFree, err = getVfsStats(partition.mountpoint) var inodes, inodesFree uint64
fs.Capacity, fs.Free, fs.Available, inodes, inodesFree, err = getVfsStats(partition.mountpoint)
fs.Inodes = &inodes
fs.InodesFree = &inodesFree
fs.Type = VFS fs.Type = VFS
} }
if err != nil { if err != nil {

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

@ -40,8 +40,8 @@ type Fs struct {
Capacity uint64 Capacity uint64
Free uint64 Free uint64
Available uint64 Available uint64
Inodes uint64 Inodes *uint64
InodesFree uint64 InodesFree *uint64
DiskStats DiskStats DiskStats DiskStats
} }

6
vendor/github.com/google/cadvisor/info/v1/container.go generated vendored
View File

@ -415,6 +415,12 @@ type FsStats struct {
// Number of bytes available for non-root user. // Number of bytes available for non-root user.
Available uint64 `json:"available"` Available uint64 `json:"available"`
// HasInodes when true, indicates that Inodes info will be available.
HasInodes bool `json:"has_inodes"`
// Number of Inodes
Inodes uint64 `json:"inodes"`
// Number of available Inodes // Number of available Inodes
InodesFree uint64 `json:"inodes_free"` InodesFree uint64 `json:"inodes_free"`

3
vendor/github.com/google/cadvisor/info/v1/machine.go generated vendored
View File

@ -26,6 +26,9 @@ type FsInfo struct {
// Total number of inodes available on the filesystem. // Total number of inodes available on the filesystem.
Inodes uint64 `json:"inodes"` Inodes uint64 `json:"inodes"`
// HasInodes when true, indicates that Inodes info will be available.
HasInodes bool `json:"has_inodes"`
} }
type Node struct { type Node struct {

7
vendor/github.com/google/cadvisor/info/v2/container.go generated vendored
View File

@ -217,8 +217,11 @@ type FsInfo struct {
// Labels associated with this filesystem. // Labels associated with this filesystem.
Labels []string `json:"labels"` Labels []string `json:"labels"`
// Number of available Inodes. // Number of Inodes.
InodesFree uint64 `json:"inodes_free"` Inodes *uint64 `json:"inodes,omitempty"`
// Number of available Inodes (if known)
InodesFree *uint64 `json:"inodes_free,omitempty"`
} }
type RequestOptions struct { type RequestOptions struct {

25
vendor/github.com/google/cadvisor/info/v2/conversion.go generated vendored
View File

@ -24,18 +24,18 @@ import (
func machineFsStatsFromV1(fsStats []v1.FsStats) []MachineFsStats { func machineFsStatsFromV1(fsStats []v1.FsStats) []MachineFsStats {
var result []MachineFsStats var result []MachineFsStats
for _, stat := range fsStats { for i := range fsStats {
stat := fsStats[i]
readDuration := time.Millisecond * time.Duration(stat.ReadTime) readDuration := time.Millisecond * time.Duration(stat.ReadTime)
writeDuration := time.Millisecond * time.Duration(stat.WriteTime) writeDuration := time.Millisecond * time.Duration(stat.WriteTime)
ioDuration := time.Millisecond * time.Duration(stat.IoTime) ioDuration := time.Millisecond * time.Duration(stat.IoTime)
weightedDuration := time.Millisecond * time.Duration(stat.WeightedIoTime) weightedDuration := time.Millisecond * time.Duration(stat.WeightedIoTime)
result = append(result, MachineFsStats{ machineFsStat := MachineFsStats{
Device: stat.Device, Device: stat.Device,
Type: stat.Type, Type: stat.Type,
Capacity: &stat.Limit, Capacity: &stat.Limit,
Usage: &stat.Usage, Usage: &stat.Usage,
Available: &stat.Available, Available: &stat.Available,
InodesFree: &stat.InodesFree,
DiskStats: DiskStats{ DiskStats: DiskStats{
ReadsCompleted: &stat.ReadsCompleted, ReadsCompleted: &stat.ReadsCompleted,
ReadsMerged: &stat.ReadsMerged, ReadsMerged: &stat.ReadsMerged,
@ -49,7 +49,11 @@ func machineFsStatsFromV1(fsStats []v1.FsStats) []MachineFsStats {
IoDuration: &ioDuration, IoDuration: &ioDuration,
WeightedIoDuration: &weightedDuration, WeightedIoDuration: &weightedDuration,
}, },
}) }
if stat.HasInodes {
machineFsStat.InodesFree = &stat.InodesFree
}
result = append(result, machineFsStat)
} }
return result return result
} }
@ -57,7 +61,8 @@ func machineFsStatsFromV1(fsStats []v1.FsStats) []MachineFsStats {
func MachineStatsFromV1(cont *v1.ContainerInfo) []MachineStats { func MachineStatsFromV1(cont *v1.ContainerInfo) []MachineStats {
var stats []MachineStats var stats []MachineStats
var last *v1.ContainerStats var last *v1.ContainerStats
for _, val := range cont.Stats { for i := range cont.Stats {
val := cont.Stats[i]
stat := MachineStats{ stat := MachineStats{
Timestamp: val.Timestamp, Timestamp: val.Timestamp,
} }

9
vendor/github.com/google/cadvisor/machine/info.go generated vendored
View File

@ -110,8 +110,13 @@ func Info(sysFs sysfs.SysFs, fsInfo fs.FsInfo, inHostNamespace bool) (*info.Mach
InstanceID: instanceID, InstanceID: instanceID,
} }
for _, fs := range filesystems { for i := range filesystems {
machineInfo.Filesystems = append(machineInfo.Filesystems, info.FsInfo{Device: fs.Device, Type: fs.Type.String(), Capacity: fs.Capacity, Inodes: fs.Inodes}) fs := filesystems[i]
inodes := uint64(0)
if fs.Inodes != nil {
inodes = *fs.Inodes
}
machineInfo.Filesystems = append(machineInfo.Filesystems, info.FsInfo{Device: fs.Device, Type: fs.Type.String(), Capacity: fs.Capacity, Inodes: inodes, HasInodes: fs.Inodes != nil})
} }
return machineInfo, nil return machineInfo, nil

19
vendor/github.com/google/cadvisor/manager/manager.go generated vendored
View File

@ -44,6 +44,8 @@ import (
"github.com/google/cadvisor/utils/sysfs" "github.com/google/cadvisor/utils/sysfs"
"github.com/google/cadvisor/version" "github.com/google/cadvisor/version"
"net/http"
"github.com/golang/glog" "github.com/golang/glog"
"github.com/opencontainers/runc/libcontainer/cgroups" "github.com/opencontainers/runc/libcontainer/cgroups"
) )
@ -125,7 +127,7 @@ type Manager interface {
} }
// New takes a memory storage and returns a new manager. // New takes a memory storage and returns a new manager.
func New(memoryCache *memory.InMemoryCache, sysfs sysfs.SysFs, maxHousekeepingInterval time.Duration, allowDynamicHousekeeping bool, ignoreMetricsSet container.MetricSet) (Manager, error) { func New(memoryCache *memory.InMemoryCache, sysfs sysfs.SysFs, maxHousekeepingInterval time.Duration, allowDynamicHousekeeping bool, ignoreMetricsSet container.MetricSet, collectorHttpClient *http.Client) (Manager, error) {
if memoryCache == nil { if memoryCache == nil {
return nil, fmt.Errorf("manager requires memory storage") return nil, fmt.Errorf("manager requires memory storage")
} }
@ -182,6 +184,7 @@ func New(memoryCache *memory.InMemoryCache, sysfs sysfs.SysFs, maxHousekeepingIn
ignoreMetrics: ignoreMetricsSet, ignoreMetrics: ignoreMetricsSet,
containerWatchers: []watcher.ContainerWatcher{}, containerWatchers: []watcher.ContainerWatcher{},
eventsChannel: eventsChannel, eventsChannel: eventsChannel,
collectorHttpClient: collectorHttpClient,
} }
machineInfo, err := machine.Info(sysfs, fsInfo, inHostNamespace) machineInfo, err := machine.Info(sysfs, fsInfo, inHostNamespace)
@ -226,6 +229,7 @@ type manager struct {
ignoreMetrics container.MetricSet ignoreMetrics container.MetricSet
containerWatchers []watcher.ContainerWatcher containerWatchers []watcher.ContainerWatcher
eventsChannel chan watcher.ContainerEvent eventsChannel chan watcher.ContainerEvent
collectorHttpClient *http.Client
} }
// Start the container manager. // Start the container manager.
@ -668,7 +672,8 @@ func (self *manager) GetFsInfo(label string) ([]v2.FsInfo, error) {
} }
} }
fsInfo := []v2.FsInfo{} fsInfo := []v2.FsInfo{}
for _, fs := range stats[0].Filesystem { for i := range stats[0].Filesystem {
fs := stats[0].Filesystem[i]
if len(label) != 0 && fs.Device != dev { if len(label) != 0 && fs.Device != dev {
continue continue
} }
@ -680,6 +685,7 @@ func (self *manager) GetFsInfo(label string) ([]v2.FsInfo, error) {
if err != nil { if err != nil {
return nil, err return nil, err
} }
fi := v2.FsInfo{ fi := v2.FsInfo{
Device: fs.Device, Device: fs.Device,
Mountpoint: mountpoint, Mountpoint: mountpoint,
@ -687,7 +693,10 @@ func (self *manager) GetFsInfo(label string) ([]v2.FsInfo, error) {
Usage: fs.Usage, Usage: fs.Usage,
Available: fs.Available, Available: fs.Available,
Labels: labels, Labels: labels,
InodesFree: fs.InodesFree, }
if fs.HasInodes {
fi.Inodes = &fs.Inodes
fi.InodesFree = &fs.InodesFree
} }
fsInfo = append(fsInfo, fi) fsInfo = append(fsInfo, fi)
} }
@ -752,7 +761,7 @@ func (m *manager) registerCollectors(collectorConfigs map[string]string, cont *c
glog.V(3).Infof("Got config from %q: %q", v, configFile) glog.V(3).Infof("Got config from %q: %q", v, configFile)
if strings.HasPrefix(k, "prometheus") || strings.HasPrefix(k, "Prometheus") { if strings.HasPrefix(k, "prometheus") || strings.HasPrefix(k, "Prometheus") {
newCollector, err := collector.NewPrometheusCollector(k, configFile, *applicationMetricsCountLimit, cont.handler) newCollector, err := collector.NewPrometheusCollector(k, configFile, *applicationMetricsCountLimit, cont.handler, m.collectorHttpClient)
if err != nil { if err != nil {
glog.Infof("failed to create collector for container %q, config %q: %v", cont.info.Name, k, err) glog.Infof("failed to create collector for container %q, config %q: %v", cont.info.Name, k, err)
return err return err
@ -763,7 +772,7 @@ func (m *manager) registerCollectors(collectorConfigs map[string]string, cont *c
return err return err
} }
} else { } else {
newCollector, err := collector.NewCollector(k, configFile, *applicationMetricsCountLimit, cont.handler) newCollector, err := collector.NewCollector(k, configFile, *applicationMetricsCountLimit, cont.handler, m.collectorHttpClient)
if err != nil { if err != nil {
glog.Infof("failed to create collector for container %q, config %q: %v", cont.info.Name, k, err) glog.Infof("failed to create collector for container %q, config %q: %v", cont.info.Name, k, err)
return err return err

10
vendor/github.com/google/cadvisor/metrics/prometheus.go generated vendored
View File

@ -493,12 +493,18 @@ func (c *PrometheusCollector) Describe(ch chan<- *prometheus.Desc) {
// Collect fetches the stats from all containers and delivers them as // Collect fetches the stats from all containers and delivers them as
// Prometheus metrics. It implements prometheus.PrometheusCollector. // Prometheus metrics. It implements prometheus.PrometheusCollector.
func (c *PrometheusCollector) Collect(ch chan<- prometheus.Metric) { func (c *PrometheusCollector) Collect(ch chan<- prometheus.Metric) {
c.errors.Set(0)
c.collectMachineInfo(ch) c.collectMachineInfo(ch)
c.collectVersionInfo(ch) c.collectVersionInfo(ch)
c.collectContainersInfo(ch) c.collectContainersInfo(ch)
c.errors.Collect(ch) c.errors.Collect(ch)
} }
const (
containerLabelPrefix = "container_label_"
containerEnvPrefix = "container_env_"
)
func (c *PrometheusCollector) collectContainersInfo(ch chan<- prometheus.Metric) { func (c *PrometheusCollector) collectContainersInfo(ch chan<- prometheus.Metric) {
containers, err := c.infoProvider.SubcontainersInfo("/", &info.ContainerInfoRequest{NumStats: 1}) containers, err := c.infoProvider.SubcontainersInfo("/", &info.ContainerInfoRequest{NumStats: 1})
if err != nil { if err != nil {
@ -529,11 +535,11 @@ func (c *PrometheusCollector) collectContainersInfo(ch chan<- prometheus.Metric)
} }
for k, v := range container.Spec.Labels { for k, v := range container.Spec.Labels {
baseLabels = append(baseLabels, sanitizeLabelName(k)) baseLabels = append(baseLabels, sanitizeLabelName(containerLabelPrefix+k))
baseLabelValues = append(baseLabelValues, v) baseLabelValues = append(baseLabelValues, v)
} }
for k, v := range container.Spec.Envs { for k, v := range container.Spec.Envs {
baseLabels = append(baseLabels, sanitizeLabelName(k)) baseLabels = append(baseLabels, sanitizeLabelName(containerEnvPrefix+k))
baseLabelValues = append(baseLabelValues, v) baseLabelValues = append(baseLabelValues, v)
} }