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

Merge pull request #71 from monnand/rename-var

Browse Source 
Fix bug introduced by pr #69
This commit is contained in:
Rohit Jnagal 2014-06-30 09:17:23 -07:00
commit 3d2b496677
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
client/client_test.go
View File

@ -103,7 +103,7 @@ func TestGetContainerInfo(t *testing.T) {
"cpu": { "cpu": {
"usage": { "usage": {
"total": 56896502, "total": 56896502,
"per_cpu": [ "per_cpu_usage": [
20479682, 20479682,
13579420, 13579420,
6025040, 6025040,
@ -133,7 +133,7 @@ func TestGetContainerInfo(t *testing.T) {
"cpu": { "cpu": {
"usage": { "usage": {
"total": 56896502, "total": 56896502,
"per_cpu": [ "per_cpu_usage": [
20479682, 20479682,
13579420, 13579420,
6025040, 6025040,
@ -163,7 +163,7 @@ func TestGetContainerInfo(t *testing.T) {
"cpu": { "cpu": {
"usage": { "usage": {
"total": 56896502, "total": 56896502,
"per_cpu": [ "per_cpu_usage": [
20479682, 20479682,
13579420, 13579420,
6025040, 6025040,
@ -193,7 +193,7 @@ func TestGetContainerInfo(t *testing.T) {
"cpu": { "cpu": {
"usage": { "usage": {
"total": 56896502, "total": 56896502,
"per_cpu": [ "per_cpu_usage": [
20479682, 20479682,
13579420, 13579420,
6025040, 6025040,
@ -223,7 +223,7 @@ func TestGetContainerInfo(t *testing.T) {
"cpu": { "cpu": {
"usage": { "usage": {
"total": 56896502, "total": 56896502,
"per_cpu": [ "per_cpu_usage": [
20479682, 20479682,
13579420, 13579420,
6025040, 6025040,
@ -253,7 +253,7 @@ func TestGetContainerInfo(t *testing.T) {
"cpu": { "cpu": {
"usage": { "usage": {
"total": 56896502, "total": 56896502,
"per_cpu": [ "per_cpu_usage": [
20479682, 20479682,
13579420, 13579420,
6025040, 6025040,
@ -283,7 +283,7 @@ func TestGetContainerInfo(t *testing.T) {
"cpu": { "cpu": {
"usage": { "usage": {
"total": 56896502, "total": 56896502,
"per_cpu": [ "per_cpu_usage": [
20479682, 20479682,
13579420, 13579420,
6025040, 6025040,
@ -313,7 +313,7 @@ func TestGetContainerInfo(t *testing.T) {
"cpu": { "cpu": {
"usage": { "usage": {
"total": 56896502, "total": 56896502,
"per_cpu": [ "per_cpu_usage": [
20479682, 20479682,
13579420, 13579420,
6025040, 6025040,
@ -343,7 +343,7 @@ func TestGetContainerInfo(t *testing.T) {
"cpu": { "cpu": {
"usage": { "usage": {
"total": 56896502, "total": 56896502,
"per_cpu": [ "per_cpu_usage": [
20479682, 20479682,
13579420, 13579420,
6025040, 6025040,
@ -373,7 +373,7 @@ func TestGetContainerInfo(t *testing.T) {
"cpu": { "cpu": {
"usage": { "usage": {
"total": 56896502, "total": 56896502,
"per_cpu": [ "per_cpu_usage": [
20479682, 20479682,
13579420, 13579420,
6025040, 6025040,
@ -403,7 +403,7 @@ func TestGetContainerInfo(t *testing.T) {
"cpu": { "cpu": {
"usage": { "usage": {
"total": 56896502, "total": 56896502,
"per_cpu": [ "per_cpu_usage": [
20479682, 20479682,
13579420, 13579420,
6025040, 6025040,
@ -433,7 +433,7 @@ func TestGetContainerInfo(t *testing.T) {
"cpu": { "cpu": {
"usage": { "usage": {
"total": 56896502, "total": 56896502,
"per_cpu": [ "per_cpu_usage": [
20479682, 20479682,
13579420, 13579420,
6025040, 6025040,
@ -463,7 +463,7 @@ func TestGetContainerInfo(t *testing.T) {
"cpu": { "cpu": {
"usage": { "usage": {
"total": 56896502, "total": 56896502,
"per_cpu": [ "per_cpu_usage": [
20479682, 20479682,
13579420, 13579420,
6025040, 6025040,
@ -493,7 +493,7 @@ func TestGetContainerInfo(t *testing.T) {
"cpu": { "cpu": {
"usage": { "usage": {
"total": 56896502, "total": 56896502,
"per_cpu": [ "per_cpu_usage": [
20479682, 20479682,
13579420, 13579420,
6025040, 6025040,
@ -523,7 +523,7 @@ func TestGetContainerInfo(t *testing.T) {
"cpu": { "cpu": {
"usage": { "usage": {
"total": 56896502, "total": 56896502,
"per_cpu": [ "per_cpu_usage": [
20479682, 20479682,
13579420, 13579420,
6025040, 6025040,

2
pages/static/containers_js.go
View File

@ -128,7 +128,7 @@ function drawCpuPerCoreUsage(elementId, machineInfo, stats) {
elements.push(cur.timestamp); elements.push(cur.timestamp);
for (var j = 0; j < machineInfo.num_cores; j++) { for (var j = 0; j < machineInfo.num_cores; j++) {
// TODO(vmarmol): This assumes we sample every second, use the timestamps. // TODO(vmarmol): This assumes we sample every second, use the timestamps.
elements.push((cur.cpu.usage.per_cpu[j] - prev.cpu.usage.per_cpu[j]) / 1000000000); elements.push((cur.cpu.usage.per_cpu_usage[j] - prev.cpu.usage.per_cpu_usage[j]) / 1000000000);
} }
data.push(elements); data.push(elements);
} }