Browse Source

Merge pull request #15885 from tombee/7866-10463-runmetrics-doc-updates

Updated runmetrics article to use up-to-date cgroup paths
moxiegirl 9 years ago
parent
commit
fd1b21b646
1 changed files with 2 additions and 2 deletions
  1. 2 2
      docs/articles/runmetrics.md

+ 2 - 2
docs/articles/runmetrics.md

@@ -78,7 +78,7 @@ in `docker ps`, its long ID might be something like
 look it up with `docker inspect` or `docker ps --no-trunc`.
 look it up with `docker inspect` or `docker ps --no-trunc`.
 
 
 Putting everything together to look at the memory metrics for a Docker
 Putting everything together to look at the memory metrics for a Docker
-container, take a look at `/sys/fs/cgroup/memory/lxc/<longid>/`.
+container, take a look at `/sys/fs/cgroup/memory/docker/<longid>/`.
 
 
 ## Metrics from cgroups: memory, CPU, block I/O
 ## Metrics from cgroups: memory, CPU, block I/O
 
 
@@ -396,7 +396,7 @@ control group (i.e., in the container). Pick any one of them.
 Putting everything together, if the "short ID" of a container is held in
 Putting everything together, if the "short ID" of a container is held in
 the environment variable `$CID`, then you can do this:
 the environment variable `$CID`, then you can do this:
 
 
-    $ TASKS=/sys/fs/cgroup/devices/$CID*/tasks
+    $ TASKS=/sys/fs/cgroup/devices/docker/$CID*/tasks
     $ PID=$(head -n 1 $TASKS)
     $ PID=$(head -n 1 $TASKS)
     $ mkdir -p /var/run/netns
     $ mkdir -p /var/run/netns
     $ ln -sf /proc/$PID/ns/net /var/run/netns/$CID
     $ ln -sf /proc/$PID/ns/net /var/run/netns/$CID