prometheus/cadvisor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

add failcnt

Browse Source
This commit is contained in:
Tomas Kral 2015-08-12 17:05:51 +02:00
parent 5d72e5ce74
commit bd61caf0c3
4 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
container/libcontainer/helpers.go
View File

@ -348,6 +348,7 @@ func toContainerStats1(s *cgroups.Stats, ret *info.ContainerStats) {
func toContainerStats2(s *cgroups.Stats, ret *info.ContainerStats) { func toContainerStats2(s *cgroups.Stats, ret *info.ContainerStats) {
ret.Memory.Usage = s.MemoryStats.Usage ret.Memory.Usage = s.MemoryStats.Usage
ret.Memory.Failcnt = s.MemoryStats.Failcnt
if v, ok := s.MemoryStats.Stats["pgfault"]; ok { if v, ok := s.MemoryStats.Stats["pgfault"]; ok {
ret.Memory.ContainerData.Pgfault = v ret.Memory.ContainerData.Pgfault = v
ret.Memory.HierarchicalData.Pgfault = v ret.Memory.HierarchicalData.Pgfault = v

2
info/v1/container.go
View File

@ -312,6 +312,8 @@ type MemoryStats struct {
// Units: Bytes. // Units: Bytes.
WorkingSet uint64 `json:"working_set"` WorkingSet uint64 `json:"working_set"`
Failcnt uint64 `json:"failcnt"`
ContainerData MemoryStatsMemoryData `json:"container_data,omitempty"` ContainerData MemoryStatsMemoryData `json:"container_data,omitempty"`
HierarchicalData MemoryStatsMemoryData `json:"hierarchical_data,omitempty"` HierarchicalData MemoryStatsMemoryData `json:"hierarchical_data,omitempty"`
} }

7
metrics/prometheus.go
View File

@ -121,6 +121,13 @@ func NewPrometheusCollector(infoProvider infoProvider) *PrometheusCollector {
} }
return values return values
}, },
}, {
name: "container_memory_failcnt",
help: "Number of memory usage hits limits",
valueType: prometheus.CounterValue,
getValues: func(s *info.ContainerStats) metricValues {
return metricValues{{value: float64(s.Memory.Failcnt)}}
},
}, { }, {
name: "container_memory_usage_bytes", name: "container_memory_usage_bytes",
help: "Current memory usage in bytes.", help: "Current memory usage in bytes.",

3
metrics/testdata/prometheus_metrics vendored
View File

@ -68,6 +68,9 @@ container_fs_writes_total{device="sda2",id="testcontainer",image="test",name="te
# HELP container_last_seen Last time a container was seen by the exporter # HELP container_last_seen Last time a container was seen by the exporter
# TYPE container_last_seen gauge # TYPE container_last_seen gauge
container_last_seen{id="testcontainer",image="test",name="testcontaineralias"} 1.426203694e+09 container_last_seen{id="testcontainer",image="test",name="testcontaineralias"} 1.426203694e+09
# HELP container_memory_failcnt Number of memory usage hits limits
# TYPE container_memory_failcnt counter
container_memory_failcnt{id="testcontainer",image="test",name="testcontaineralias"} 0
# HELP container_memory_failures_total Cumulative count of memory allocation failures. # HELP container_memory_failures_total Cumulative count of memory allocation failures.
# TYPE container_memory_failures_total counter # TYPE container_memory_failures_total counter
container_memory_failures_total{id="testcontainer",image="test",name="testcontaineralias",scope="container",type="pgfault"} 10 container_memory_failures_total{id="testcontainer",image="test",name="testcontaineralias",scope="container",type="pgfault"} 10