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

Merge remote-tracking branch 'upstream/master' into bigquery

Browse Source 
Docker-DCO-1.1-Signed-off-by: Rohit Jnagal <jnagal@google.com> (github: rjnagal)
This commit is contained in:
Rohit Jnagal 2014-08-26 00:38:58 +00:00
commit 1ec1968960
4 changed files with 3 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -23,6 +23,8 @@ sudo docker run \
cAdvisor is now running (in the background) on `http://localhost:8080`. The setup includes directories with Docker state cAdvisor needs to observe. cAdvisor is now running (in the background) on `http://localhost:8080`. The setup includes directories with Docker state cAdvisor needs to observe.
**Note**: On CentOS and RHEL 6, run cAdvisor with an additional option ```--volume=/cgroup:/cgroup \```
If you want to build your own cAdvisor Docker image, take a look at the Dockerfile which can build a cAdvisor docker container under `quickstart/Dockerfile`. If you want to build your own cAdvisor Docker image, take a look at the Dockerfile which can build a cAdvisor docker container under `quickstart/Dockerfile`.
#### Using [InfluxDB](http://influxdb.com) as backend storage #### Using [InfluxDB](http://influxdb.com) as backend storage

2
pages/containers_html.go
View File

@ -144,8 +144,6 @@ const containersHtmlTemplate = `
{{ getMemoryUsage .Stats }} MB ({{ getMemoryUsagePercent .Spec .Stats .MachineInfo}}%) {{ getMemoryUsage .Stats }} MB ({{ getMemoryUsagePercent .Spec .Stats .MachineInfo}}%)
</div> </div>
</div> </div>
<h4>Page Faults</h4>
<div id="memory-page-faults-chart"></div>
</div> </div>
</div> </div>
{{end}} {{end}}

22
pages/static/containers_js.go
View File

@ -206,25 +206,6 @@ function drawMemoryUsage(elementId, containerInfo) {
drawLineChart(titles, data, elementId, "Megabytes"); drawLineChart(titles, data, elementId, "Megabytes");
} }
function drawMemoryPageFaults(elementId, containerInfo) {
var titles = ["Time", "Faults", "Major Faults"];
var data = [];
for (var i = 1; i < containerInfo.stats.length; i++) {
var cur = containerInfo.stats[i];
var prev = containerInfo.stats[i - 1];
// TODO(vmarmol): This assumes we sample every second, use the timestamps.
var elements = [];
elements.push(cur.timestamp);
elements.push(cur.memory.hierarchical_data.pgfault - prev.memory.hierarchical_data.pgfault);
// TODO(vmarmol): Fix to expose this data.
//elements.push(cur.memory.hierarchical_data.pgmajfault - prev.memory.hierarchical_data.pgmajfault);
elements.push(0);
data.push(elements);
}
drawLineChart(titles, data, elementId, "Faults");
}
// Draw the graph for network tx/rx bytes. // Draw the graph for network tx/rx bytes.
function drawNetworkBytes(elementId, machineInfo, stats) { function drawNetworkBytes(elementId, machineInfo, stats) {
var titles = ["Time", "Tx bytes", "Rx bytes"]; var titles = ["Time", "Tx bytes", "Rx bytes"];
@ -302,9 +283,6 @@ function drawCharts(machineInfo, containerInfo) {
steps.push(function() { steps.push(function() {
drawMemoryUsage("memory-usage-chart", containerInfo); drawMemoryUsage("memory-usage-chart", containerInfo);
}); });
steps.push(function() {
drawMemoryPageFaults("memory-page-faults-chart", containerInfo);
});
// Network. // Network.
steps.push(function() { steps.push(function() {

1
storage/influxdb/influxdb_test.go
View File

@ -1,3 +1,4 @@
//+build ignore
// Copyright 2014 Google Inc. All Rights Reserved. // Copyright 2014 Google Inc. All Rights Reserved.
// //
// Licensed under the Apache License, Version 2.0 (the "License"); // Licensed under the Apache License, Version 2.0 (the "License");