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

Merge pull request #319 from vmarmol/omitempty-stats

Browse Source 
Memory stats should not be omited if empty.
This commit is contained in:
Vish Kannan 2014-11-19 15:11:57 -08:00
commit 5884edd71b
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
info/container.go
View File

@ -197,29 +197,23 @@ type DiskIoStats struct {
} }
type MemoryStats struct { type MemoryStats struct {
// Memory limit, equivalent to "limit" in MemorySpec.
// Units: Bytes.
Limit uint64 `json:"limit,omitempty"`
// Usage statistics.
// Current memory usage, this includes all memory regardless of when it was // Current memory usage, this includes all memory regardless of when it was
// accessed. // accessed.
// Units: Bytes. // Units: Bytes.
Usage uint64 `json:"usage,omitempty"` Usage uint64 `json:"usage"`
// The amount of working set memory, this includes recently accessed memory, // The amount of working set memory, this includes recently accessed memory,
// dirty memory, and kernel memory. Working set is <= "usage". // dirty memory, and kernel memory. Working set is <= "usage".
// Units: Bytes. // Units: Bytes.
WorkingSet uint64 `json:"working_set,omitempty"` WorkingSet uint64 `json:"working_set"`
ContainerData MemoryStatsMemoryData `json:"container_data,omitempty"` ContainerData MemoryStatsMemoryData `json:"container_data,omitempty"`
HierarchicalData MemoryStatsMemoryData `json:"hierarchical_data,omitempty"` HierarchicalData MemoryStatsMemoryData `json:"hierarchical_data,omitempty"`
} }
type MemoryStatsMemoryData struct { type MemoryStatsMemoryData struct {
Pgfault uint64 `json:"pgfault,omitempty"` Pgfault uint64 `json:"pgfault"`
Pgmajfault uint64 `json:"pgmajfault,omitempty"` Pgmajfault uint64 `json:"pgmajfault"`
} }
type NetworkStats struct { type NetworkStats struct {