Bump cAdvisor to v0.43.0
Bumping cAdvisor from v0.39.2 -> v0.43.0 * Also pin transitive dependencies * containerd v1.4.9 -> v1.4.11 * docker v20.10.2+incompatible> v20.10.7+incompatible Signed-off-by: David Porter <david@porter.me>
This commit is contained in:
16
vendor/github.com/google/cadvisor/metrics/prometheus.go
generated
vendored
16
vendor/github.com/google/cadvisor/metrics/prometheus.go
generated
vendored
@@ -1757,6 +1757,17 @@ func NewPrometheusCollector(i infoProvider, f ContainerLabelsFunc, includedMetri
|
||||
},
|
||||
}...)
|
||||
}
|
||||
if includedMetrics.Has(container.OOMMetrics) {
|
||||
c.containerMetrics = append(c.containerMetrics, containerMetric{
|
||||
name: "container_oom_events_total",
|
||||
help: "Count of out of memory events observed for the container",
|
||||
valueType: prometheus.CounterValue,
|
||||
getValues: func(s *info.ContainerStats) metricValues {
|
||||
return metricValues{{value: float64(s.OOMEvents), timestamp: s.Timestamp}}
|
||||
},
|
||||
})
|
||||
}
|
||||
|
||||
return c
|
||||
}
|
||||
|
||||
@@ -1825,7 +1836,7 @@ func DefaultContainerLabels(container *info.ContainerInfo) map[string]string {
|
||||
}
|
||||
|
||||
// BaseContainerLabels returns a ContainerLabelsFunc that exports the container
|
||||
// name, first alias, image name as well as white listed label values.
|
||||
// name, first alias, image name as well as all its white listed env and label values.
|
||||
func BaseContainerLabels(whiteList []string) func(container *info.ContainerInfo) map[string]string {
|
||||
whiteListMap := make(map[string]struct{}, len(whiteList))
|
||||
for _, k := range whiteList {
|
||||
@@ -1845,6 +1856,9 @@ func BaseContainerLabels(whiteList []string) func(container *info.ContainerInfo)
|
||||
set[ContainerLabelPrefix+k] = v
|
||||
}
|
||||
}
|
||||
for k, v := range container.Spec.Envs {
|
||||
set[ContainerEnvPrefix+k] = v
|
||||
}
|
||||
return set
|
||||
}
|
||||
}
|
||||
|
11
vendor/github.com/google/cadvisor/metrics/prometheus_machine.go
generated
vendored
11
vendor/github.com/google/cadvisor/metrics/prometheus_machine.go
generated
vendored
@@ -17,9 +17,10 @@ package metrics
|
||||
import (
|
||||
"strconv"
|
||||
|
||||
"github.com/prometheus/client_golang/prometheus"
|
||||
|
||||
"github.com/google/cadvisor/container"
|
||||
info "github.com/google/cadvisor/info/v1"
|
||||
"github.com/prometheus/client_golang/prometheus"
|
||||
|
||||
"k8s.io/klog/v2"
|
||||
)
|
||||
@@ -334,6 +335,14 @@ func getCaches(machineInfo *info.MachineInfo) metricValues {
|
||||
timestamp: machineInfo.Timestamp,
|
||||
})
|
||||
}
|
||||
for _, cache := range core.UncoreCaches {
|
||||
mValues = append(mValues,
|
||||
metricValue{
|
||||
value: float64(cache.Size),
|
||||
labels: []string{nodeID, coreID, cache.Type, strconv.Itoa(cache.Level)},
|
||||
timestamp: machineInfo.Timestamp,
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
for _, cache := range node.Caches {
|
||||
|
Reference in New Issue
Block a user