summaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authornicolargo <nicolas@nicolargo.com>2016-10-10 21:10:10 +0200
committernicolargo <nicolas@nicolargo.com>2016-10-10 21:10:10 +0200
commit92ec33c272ad5d30c4cc6865ff78eebbc4723143 (patch)
tree9e1200226fa0906540e6736c09e4dcedd76cf5b8 /docs
parent4396634e600b3b4e5e2ef78f2fbcc3eec2058e2c (diff)
Update docs for Docker limits and actions (issue #875)
Diffstat (limited to 'docs')
-rw-r--r--docs/aoa/docker.rst21
-rw-r--r--docs/man/glances.12
2 files changed, 22 insertions, 1 deletions
diff --git a/docs/aoa/docker.rst b/docs/aoa/docker.rst
index b5bcd047..c4585e75 100644
--- a/docs/aoa/docker.rst
+++ b/docs/aoa/docker.rst
@@ -8,4 +8,25 @@ Glances uses the Docker API through the `docker-py`_ library.
.. image:: ../_static/docker.png
+It is possible to define limits and actions from the configuration file
+under the ``[docker]`` section:
+
+.. code-block:: ini
+
+ [docker]
+ # Global containers' thresholds for CPU and MEM (in %)
+ cpu_careful=50
+ cpu_warning=70
+ cpu_critical=90
+ mem_careful=20
+ mem_warning=50
+ mem_critical=70
+ # Per container thresholds
+ containername_cpu_careful=10
+ containername_cpu_warning=20
+ containername_cpu_critical=30
+ containername_cpu_critical_action=echo {{Image}} {{Id}} {{cpu}} > /tmp/container_{{name}}.alert
+
+You can use all the variables ({{foo}}) available in the Docker plugin.
+
.. _docker-py: https://github.com/docker/docker-py
diff --git a/docs/man/glances.1 b/docs/man/glances.1
index 4e65242d..310c2031 100644
--- a/docs/man/glances.1
+++ b/docs/man/glances.1
@@ -1,6 +1,6 @@
.\" Man page generated from reStructuredText.
.
-.TH "GLANCES" "1" "Sep 24, 2016" "2.8_DEVELOP" "Glances"
+.TH "GLANCES" "1" "Oct 10, 2016" "2.8_DEVELOP" "Glances"
.SH NAME
glances \- An eye on your system
.