summaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authornicolargo <nicolashennion@gmail.com>2015-03-24 21:10:25 +0100
committernicolargo <nicolashennion@gmail.com>2015-03-24 21:10:25 +0100
commit2ce28dfa1887a07d3e62b877eb92502cc1e3d155 (patch)
treec0ec6a19f2cd66f0e8fffb058f17b5e17146c0b3 /docs
parent6a8de48502a85fbd4592d7cc43cdde4f610ae894 (diff)
Update documentation and add Grafana screenshot
Diffstat (limited to 'docs')
-rw-r--r--docs/glances-doc.rst11
-rw-r--r--docs/images/grafana.pngbin0 -> 202873 bytes
2 files changed, 8 insertions, 3 deletions
diff --git a/docs/glances-doc.rst b/docs/glances-doc.rst
index 94a47444..dcbcf577 100644
--- a/docs/glances-doc.rst
+++ b/docs/glances-doc.rst
@@ -2,11 +2,11 @@
Glances
=======
-This manual describes *Glances* version 2.3.
+This manual describes *Glances* version 2.4.
Copyright © 2011-2015 Nicolas Hennion <nicolas@nicolargo.com>
-January 2015
+April 2015
.. contents:: Table of Contents
@@ -398,7 +398,7 @@ Disconnected:
.. image:: images/disconnected.png
-QUICKLOOK
+QuickLook
---------
The quicklook plugin is only display on wide screen and propose a bar view for CPU and memory (virtual and swap).
@@ -790,6 +790,10 @@ and run Glances with:
$ glances --export-influxdb
+For Grafana users', Glances provides a dedicated `dashboard`_. Just import the file in your Grafana Web interface.
+
+.. image:: images/grafana.png
+
*Statsd*
You can export statistics to a Statsd server (welcome to Graphite !). The connection should be defined in the Glances configuration file as following:
@@ -848,3 +852,4 @@ Feel free to contribute !
.. _XML-RPC server: http://docs.python.org/2/library/simplexmlrpcserver.html
.. _RESTFUL-JSON: http://jsonapi.org/
.. _forum: https://groups.google.com/forum/?hl=en#!forum/glances-users
+.. _forum: https://github.com/nicolargo/glances/blob/master/conf/glances-grafana.json
diff --git a/docs/images/grafana.png b/docs/images/grafana.png
new file mode 100644
index 00000000..cd1602e3
--- /dev/null
+++ b/docs/images/grafana.png
Binary files differ