summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornicolargo <nicolashennion@gmail.com>2016-09-04 16:53:32 +0200
committernicolargo <nicolashennion@gmail.com>2016-09-04 16:53:32 +0200
commit9d8719283952f1eed7ffa17ad4208eb24f17208d (patch)
tree13de24c36c4b502b9320c222f6e68c0cb0053eb6
parent8fa75b254add6e94dad17f3ad7a728c6879800bb (diff)
Update Glances global description
-rw-r--r--docs/index.rst15
-rw-r--r--docs/man/glances.126
2 files changed, 31 insertions, 10 deletions
diff --git a/docs/index.rst b/docs/index.rst
index b8796d6f..13b3d5fd 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -3,14 +3,13 @@ Glances
.. image:: _static/screenshot-wide.png
-Glances is a cross-platform curses-based monitoring tool which aims to
-present a maximum of information in a minimum of space, ideally to fit
-in a classical 80x24 terminal or higher to have additional information.
-It can adapt dynamically the displayed information depending on the
-terminal size.
-
-It can also work in client/server mode. Remote monitoring
-could be done via terminal or Web interface.
+Glances is a cross-platform monitoring tool which aims to present a
+maximum of information in a minimum of space through a curses or Web
+based interface. It can adapt dynamically the displayed information
+depending on the terminal size.
+
+It can also work in client/server mode. Remote monitoring could be
+done via terminal, Web interface or API (XMLRPC and RESTful).
Glances is written in Python and uses the `psutil`_ library to get
information from your system.
diff --git a/docs/man/glances.1 b/docs/man/glances.1
index 370dd432..bbd33e5b 100644
--- a/docs/man/glances.1
+++ b/docs/man/glances.1
@@ -1,6 +1,6 @@
.\" Man page generated from reStructuredText.
.
-.TH "GLANCES" "1" "March 31, 2016" "2.7_BETA" "Glances"
+.TH "GLANCES" "1" "Sep 04, 2016" "2.7_RC1" "Glances"
.SH NAME
glances \- An eye on your system
.
@@ -148,6 +148,11 @@ disable Docker module
.UNINDENT
.INDENT 0.0
.TP
+.B \-\-disable\-ports
+disable Ports module
+.UNINDENT
+.INDENT 0.0
+.TP
.B \-5, \-\-disable\-top
disable top menu (QuickLook, CPU, MEM, SWAP and LOAD)
.UNINDENT
@@ -164,6 +169,11 @@ disable process module
.UNINDENT
.INDENT 0.0
.TP
+.B \-\-disable\-amps
+disable application monitoring process module
+.UNINDENT
+.INDENT 0.0
+.TP
.B \-\-disable\-log
disable log module
.UNINDENT
@@ -204,6 +214,11 @@ export stats to an InfluxDB server (influxdb lib needed)
.UNINDENT
.INDENT 0.0
.TP
+.B \-\-export\-cassandra
+export stats to a Cassandra/Scylla server (cassandra lib needed)
+.UNINDENT
+.INDENT 0.0
+.TP
.B \-\-export\-opentsdb
export stats to an OpenTSDB server (potsdb lib needed)
.UNINDENT
@@ -404,6 +419,9 @@ If MEM \fB>70%\fP, sort processes by MEM usage
If CPU iowait \fB>60%\fP, sort processes by I/O read and write
.UNINDENT
.TP
+.B \fBA\fP
+Enable/disable Application Monitoring Process
+.TP
.B \fBb\fP
Switch between bit/s or Byte/s for network I/O
.TP
@@ -461,6 +479,9 @@ Sort processes by name
.B \fBq|ESC\fP
Quit the current Glances session
.TP
+.B \fBQ\fP
+Show/hide IRQ module
+.TP
.B \fBr\fP
Reset history
.TP
@@ -555,7 +576,8 @@ $ glances \-\-export\-csv
.UNINDENT
.sp
Monitor local machine and export stats to a InfluxDB server with 5s
-refresh time:
+refresh time (also possible to export to OpenTSDB, Cassandra, Statsd,
+ElasticSearch, RabbitMQ and Riemann):
.INDENT 0.0
.INDENT 3.5
$ glances \-t 5 \-\-export\-influxdb