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

Merge pull request #741 from rjnagal/summary

Browse Source 
Add filesystem, diskio, and network to spec.
This commit is contained in:
Victor Marmol 2015-05-28 16:36:00 -07:00
commit 909749d357
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
info/v2/container.go
View File

@ -72,6 +72,11 @@ type ContainerSpec struct {
HasMemory bool `json:"has_memory"` HasMemory bool `json:"has_memory"`
Memory MemorySpec `json:"memory,omitempty"` Memory MemorySpec `json:"memory,omitempty"`
// Following resources have no associated spec, but are being isolated.
HasNetwork bool `json:"has_network"`
HasFilesystem bool `json:"has_filesystem"`
HasDiskIo bool `json:"has_diskio"`
} }
type ContainerStats struct { type ContainerStats struct {

9
manager/manager.go
View File

@ -361,9 +361,12 @@ func (self *manager) GetContainerSpec(containerName string, options v2.RequestOp
func (self *manager) getV2Spec(cinfo *containerInfo) v2.ContainerSpec { func (self *manager) getV2Spec(cinfo *containerInfo) v2.ContainerSpec {
specV1 := self.getAdjustedSpec(cinfo) specV1 := self.getAdjustedSpec(cinfo)
specV2 := v2.ContainerSpec{ specV2 := v2.ContainerSpec{
CreationTime: specV1.CreationTime, CreationTime: specV1.CreationTime,
HasCpu: specV1.HasCpu, HasCpu: specV1.HasCpu,
HasMemory: specV1.HasMemory, HasMemory: specV1.HasMemory,
HasFilesystem: specV1.HasFilesystem,
HasNetwork: specV1.HasNetwork,
HasDiskIo: specV1.HasDiskIo,
} }
if specV1.HasCpu { if specV1.HasCpu {
specV2.Cpu.Limit = specV1.Cpu.Limit specV2.Cpu.Limit = specV1.Cpu.Limit