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

Fixed formatting

Browse Source
This commit is contained in:
Abin Shahab 2014-10-14 02:59:14 +00:00
parent a02b7f1620
commit 07fbd1ddab
2 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
container/raw/handler.go
View File

@ -177,12 +177,12 @@ func (self *rawContainerHandler) GetStats() (*info.ContainerStats, error) {
if self.network_interface != nil { if self.network_interface != nil {
n := network.NetworkState{VethHost: self.network_interface.VethHost, VethChild: self.network_interface.VethChild, NsPath: "unknown"} n := network.NetworkState{VethHost: self.network_interface.VethHost, VethChild: self.network_interface.VethChild, NsPath: "unknown"}
s := dockerlibcontainer.State{NetworkState: n} s := dockerlibcontainer.State{NetworkState: n}
stats, err = libcontainer.GetStats(self.cgroup, &s) stats, err = libcontainer.GetStats(self.cgroup, &s)
} else { } else {
stats, err = libcontainer.GetStatsCgroupOnly(self.cgroup) stats, err = libcontainer.GetStatsCgroupOnly(self.cgroup)
} }
if err != nil { if err != nil {
return nil, err return nil, err
} }
// Get Filesystem information only for the root cgroup. // Get Filesystem information only for the root cgroup.
if self.name == "/" { if self.name == "/" {

14
container/raw/test_resources/cdesc.json
View File

@ -5,8 +5,6 @@
{ {
"name": "10-10-10-27", "name": "10-10-10-27",
"ip": "10.10.10.27/24", "ip": "10.10.10.27/24",
"image": "registry.test.altiscale.com:5000/prometheus-init-201405270218",
"public_key": "/root/.ssh/authorized_keys",
"publish": null, "publish": null,
"gateway": null, "gateway": null,
"hostname": "10-10-10-27.local.altiscale.com", "hostname": "10-10-10-27.local.altiscale.com",
@ -14,7 +12,6 @@
"init": null, "init": null,
"cpu": null, "cpu": null,
"memory": null, "memory": null,
"role": "compute_node",
"net": null, "net": null,
"netinit": "false", "netinit": "false",
"network_interface": { "network_interface": {
@ -48,14 +45,7 @@
"permission": "rw" "permission": "rw"
} }
], ],
"host": { "id": "18a4585950db428e4d5a65c216a5d708d241254709626f4cb300ee963fb4b144"
"hostname": "localhost",
"ip": "127.0.0.1",
"bridge": "alti0",
"key": ""
},
"id": "18a4585950db428e4d5a65c216a5d708d241254709626f4cb300ee963fb4b144",
"initpid": "10741"
} }
] ]
} }