diff --git a/README.md b/README.md index 224b9046..8fba3e82 100644 --- a/README.md +++ b/README.md @@ -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. +**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`. #### Using [InfluxDB](http://influxdb.com) as backend storage diff --git a/pages/containers_html.go b/pages/containers_html.go index 5d311b7d..e789dc47 100644 --- a/pages/containers_html.go +++ b/pages/containers_html.go @@ -144,8 +144,6 @@ const containersHtmlTemplate = ` {{ getMemoryUsage .Stats }} MB ({{ getMemoryUsagePercent .Spec .Stats .MachineInfo}}%) -

Page Faults

-
{{end}} diff --git a/pages/static/containers_js.go b/pages/static/containers_js.go index e01aadb0..c31d9b5c 100644 --- a/pages/static/containers_js.go +++ b/pages/static/containers_js.go @@ -206,25 +206,6 @@ function drawMemoryUsage(elementId, containerInfo) { 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. function drawNetworkBytes(elementId, machineInfo, stats) { var titles = ["Time", "Tx bytes", "Rx bytes"]; @@ -302,9 +283,6 @@ function drawCharts(machineInfo, containerInfo) { steps.push(function() { drawMemoryUsage("memory-usage-chart", containerInfo); }); - steps.push(function() { - drawMemoryPageFaults("memory-page-faults-chart", containerInfo); - }); // Network. steps.push(function() { diff --git a/storage/influxdb/influxdb_test.go b/storage/influxdb/influxdb_test.go index ba9ec1b6..9f34d1c0 100644 --- a/storage/influxdb/influxdb_test.go +++ b/storage/influxdb/influxdb_test.go @@ -1,3 +1,4 @@ +//+build ignore // Copyright 2014 Google Inc. All Rights Reserved. // // Licensed under the Apache License, Version 2.0 (the "License");