summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas Hennion <nicolas@nicolargo.com>2012-12-29 22:05:18 +0100
committerNicolas Hennion <nicolas@nicolargo.com>2012-12-29 22:05:18 +0100
commit12758bb4543d5a95818e23a954537298b430342d (patch)
treeae26502d8d0d572ccce0b60f8b53b7e2681be468
parent98684868d28ce424c507d2840d6e5ffa17d35f89 (diff)
Update doc
-rw-r--r--README24
-rw-r--r--README-fr19
-rw-r--r--README.md24
-rw-r--r--doc/cpu-wide.pngbin5839 -> 6739 bytes
-rw-r--r--doc/cpu.pngbin3926 -> 4135 bytes
-rw-r--r--doc/mem-wide.pngbin0 -> 10125 bytes
-rw-r--r--doc/mem.pngbin7789 -> 7262 bytes
-rw-r--r--doc/percpu.pngbin9649 -> 7576 bytes
-rw-r--r--doc/processlist-wide.pngbin69140 -> 92079 bytes
-rw-r--r--doc/processlist.pngbin31400 -> 47129 bytes
-rw-r--r--screenshot-wide.pngbin162829 -> 149658 bytes
-rw-r--r--screenshot.pngbin76873 -> 83476 bytes
12 files changed, 42 insertions, 25 deletions
diff --git a/README b/README
index 5db23e71..936c66f2 100644
--- a/README
+++ b/README
@@ -171,6 +171,7 @@ When Glances is running, you can press:
* 'm' sort the processes list by process MEM
* 'n' disable or enable the network interfaces stats
* 'p' sort by process name
+* 's' disable or enable the sensor stats (only available with -e tag)
* 'w' delete finished warning logs messages
* 'x' delete finished warning and critical logs messages
* '1' switch between global CPU and per core stats
@@ -195,16 +196,18 @@ Short view:
![screenshot](https://github.com/nicolargo/glances/raw/master/doc/cpu.png)
-Long view (only available if your terminal is wide enough)
+If horizontal space is available, extended CPU infomations are displayed.
+
+Extended view (only available if your terminal is wide enough)
![screenshot](https://github.com/nicolargo/glances/raw/master/doc/cpu-wide.png)
-The CPU stats are shown as a percentage and for the configured refresh
-time. The total CPU usage is displayed on the first line.
+If user click on the '1' key, per CPU stats is displayed:
![screenshot](https://github.com/nicolargo/glances/raw/master/doc/percpu.png)
-If horizontal space is available, per core CPU infomations are displayed.
+The CPU stats are shown as a percentage and for the configured refresh
+time. The total CPU usage is displayed on the first line.
Color code used:
@@ -238,13 +241,14 @@ If average load is > 5*Core, then status is set to "CRITICAL".
### Memory
-![screenshot](https://github.com/nicolargo/glances/raw/master/doc/mem.png)
-Glances uses three columns: memory (RAM), "real" and swap.
+Glances uses two columns: one for the RAM and another one for the SWAP.
+
+![screenshot](https://github.com/nicolargo/glances/raw/master/doc/mem.png)
-Real used memory is: used - cache.
+If space is available, Glances displays extended informations:
-Real free memory is: free + cache.
+![screenshot](https://github.com/nicolargo/glances/raw/master/doc/mem-wide.png)
With Glances, alerts are only set for on used swap and real memory.
@@ -282,6 +286,8 @@ if the bit rate is higher than 70 Mbps.
Optionally, Glances displays the sensors informations (lm-sensors).
+A filter is processed in order to only display temperature.
+
You should enable this module using the following command line:
glances -e
@@ -347,8 +353,8 @@ The number of processes in the list is adapted to the screen size.
T - Traced or stopped
Z - Zombie or "hung" process
-* IO_R and IO_W: Per process IO read and write
* TIME+: Cumulative CPU time used
+* IO_R and IO_W: Per process IO read and write
* NAME: Process name or command line
### Logs
diff --git a/README-fr b/README-fr
index f22044e0..c542bda0 100644
--- a/README-fr
+++ b/README-fr
@@ -1,3 +1,5 @@
+[![Flattr this git repo](http://api.flattr.com/button/flattr-badge-large.png)](https://flattr.com/thing/484466/nicolargoglances-on-GitHub)
+
===========================================
Glances -- Votre système en un coups d'oeil
===========================================
@@ -175,6 +177,7 @@ Quand Glances est lancé, il est possible d'utiliser les touches suivantes:
* 'm' forcer le tri par consommation MEMOIRE
* 'n' desactiver ou activer l'affichage des interfaces réseau
* 'p' forcer le tri par nom de processus
+* 's' desactiver ou activer l'affichage des temperatures (si option -e)
* 'w' supprimer les alertes finies de type WARNING
* 'x' supprimer les alertes finies de type WARNING et CRITICAL
* '1' passer des stats CPU globale à CPU détaillé
@@ -199,12 +202,12 @@ Vue si la taille du terminal est suffisante:
![screenshot](https://github.com/nicolargo/glances/raw/master/doc/cpu-wide.png)
-L'état de la CPU est affiché par un pourcentage de l'utilisation globale.
+Si la taille de la fenêtre est suffisante et que l'utilisateur clique sur,
+la touche '1' alors Glances affiche les informations de CPU par coeur.
![screenshot](https://github.com/nicolargo/glances/raw/master/doc/percpu.png)
-Si la taille de la fenêtre est suffisante, Glances affiche les informations
-de CPU par coeur.
+L'état de la CPU est affiché par un pourcentage de l'utilisation globale.
Les codes couleurs suivant sont utilisés:
@@ -240,13 +243,13 @@ Si la charge moyenne est > 5*Core, alors le status est "CRITICAL".
### Mémoire
-![screenshot](https://github.com/nicolargo/glances/raw/master/doc/mem.png)
+Glances affiche 2 type d'information pour la mémoire: RAM et SWAP.
-Glances affiche 3 types d'informations pour la mémoire: RAM, SWAP et réelle.
+![screenshot](https://github.com/nicolargo/glances/raw/master/doc/mem.png)
-La mémoire réelle occupée est calculée ainsi = used - cache.
+Si l'espace est disponible, alors Glances affiche aussi:
-La mémoire réelle libre est calculée ainsi = free + cache.
+![screenshot](https://github.com/nicolargo/glances/raw/master/doc/mem-wide.png)
Les alertes utilisent les seuils suivants:
@@ -285,6 +288,8 @@ passera à WARNING si le débit dépasse les 70 Mbps.
Glances peut afficher les informations sur les capteurs (lm-sensors).
+Un filtre est appliqué pour afficher uniquement les températures.
+
Ce module est optionnel et doit être activé avec l'option:
glances -e
diff --git a/README.md b/README.md
index 5db23e71..936c66f2 100644
--- a/README.md
+++ b/README.md
@@ -171,6 +171,7 @@ When Glances is running, you can press:
* 'm' sort the processes list by process MEM
* 'n' disable or enable the network interfaces stats
* 'p' sort by process name
+* 's' disable or enable the sensor stats (only available with -e tag)
* 'w' delete finished warning logs messages
* 'x' delete finished warning and critical logs messages
* '1' switch between global CPU and per core stats
@@ -195,16 +196,18 @@ Short view:
![screenshot](https://github.com/nicolargo/glances/raw/master/doc/cpu.png)
-Long view (only available if your terminal is wide enough)
+If horizontal space is available, extended CPU infomations are displayed.
+
+Extended view (only available if your terminal is wide enough)
![screenshot](https://github.com/nicolargo/glances/raw/master/doc/cpu-wide.png)
-The CPU stats are shown as a percentage and for the configured refresh
-time. The total CPU usage is displayed on the first line.
+If user click on the '1' key, per CPU stats is displayed:
![screenshot](https://github.com/nicolargo/glances/raw/master/doc/percpu.png)
-If horizontal space is available, per core CPU infomations are displayed.
+The CPU stats are shown as a percentage and for the configured refresh
+time. The total CPU usage is displayed on the first line.
Color code used:
@@ -238,13 +241,14 @@ If average load is > 5*Core, then status is set to "CRITICAL".
### Memory
-![screenshot](https://github.com/nicolargo/glances/raw/master/doc/mem.png)
-Glances uses three columns: memory (RAM), "real" and swap.
+Glances uses two columns: one for the RAM and another one for the SWAP.
+
+![screenshot](https://github.com/nicolargo/glances/raw/master/doc/mem.png)
-Real used memory is: used - cache.
+If space is available, Glances displays extended informations:
-Real free memory is: free + cache.
+![screenshot](https://github.com/nicolargo/glances/raw/master/doc/mem-wide.png)
With Glances, alerts are only set for on used swap and real memory.
@@ -282,6 +286,8 @@ if the bit rate is higher than 70 Mbps.
Optionally, Glances displays the sensors informations (lm-sensors).
+A filter is processed in order to only display temperature.
+
You should enable this module using the following command line:
glances -e
@@ -347,8 +353,8 @@ The number of processes in the list is adapted to the screen size.
T - Traced or stopped
Z - Zombie or "hung" process
-* IO_R and IO_W: Per process IO read and write
* TIME+: Cumulative CPU time used
+* IO_R and IO_W: Per process IO read and write
* NAME: Process name or command line
### Logs
diff --git a/doc/cpu-wide.png b/doc/cpu-wide.png
index 59ceaea1..9c1032a0 100644
--- a/doc/cpu-wide.png
+++ b/doc/cpu-wide.png
Binary files differ
diff --git a/doc/cpu.png b/doc/cpu.png
index 257e186c..1d5093d3 100644
--- a/doc/cpu.png
+++ b/doc/cpu.png
Binary files differ
diff --git a/doc/mem-wide.png b/doc/mem-wide.png
new file mode 100644
index 00000000..570c022f
--- /dev/null
+++ b/doc/mem-wide.png
Binary files differ
diff --git a/doc/mem.png b/doc/mem.png
index fa4be64c..5128c6e8 100644
--- a/doc/mem.png
+++ b/doc/mem.png
Binary files differ
diff --git a/doc/percpu.png b/doc/percpu.png
index bdd9eb2b..16601447 100644
--- a/doc/percpu.png
+++ b/doc/percpu.png
Binary files differ
diff --git a/doc/processlist-wide.png b/doc/processlist-wide.png
index 9fc7ff74..aa9b2446 100644
--- a/doc/processlist-wide.png
+++ b/doc/processlist-wide.png
Binary files differ
diff --git a/doc/processlist.png b/doc/processlist.png
index cf0df9ab..460e0f8c 100644
--- a/doc/processlist.png
+++ b/doc/processlist.png
Binary files differ
diff --git a/screenshot-wide.png b/screenshot-wide.png
index 881343a5..223c06f8 100644
--- a/screenshot-wide.png
+++ b/screenshot-wide.png
Binary files differ
diff --git a/screenshot.png b/screenshot.png
index 80bdd284..539187b9 100644
--- a/screenshot.png
+++ b/screenshot.png
Binary files differ