diff options
83 files changed, 2551 insertions, 646 deletions
@@ -5,7 +5,9 @@ Developers Nicolas Hennion (aka) Nicolargo http://blog.nicolargo.com https://twitter.com/nicolargo -contact@nicolargo.com +nicolashennion@gmail.com +PGP Fingerprint: 835F C447 3BCD 60E9 9200 2778 ABA4 D1AB 9731 6A3C +PGP Public key: gpg --keyserver pgp.mit.edu --recv-keys 0xaba4d1ab97316a3c Alessio Sergi (aka) al3hex https://twitter.com/al3hex @@ -19,6 +21,9 @@ https://github.com/jrenner Maxime Desbrus (aka) desbma https://github.com/desbma +Nicolas Hart (aka) NclsHart for the UI design +https://github.com/nclsHart + ========= Packagers ========= diff --git a/MANIFEST.in b/MANIFEST.in index dae6a3d7..98cb6021 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -4,6 +4,7 @@ include NEWS include README.rst include conf/glances.conf include glances/outputs/bottle/*.tpl +include glances/outputs/static/*.ico include glances/outputs/static/css/*.css include glances/outputs/static/js/*.js include man/glances.1 @@ -2,6 +2,31 @@ Glances Version 2.x ============================================================================== +Version 2.3 +=========== + +Enhancements and news features: + + * Add the Docker plugin (issue #440) with per container CPU and memory monitoring (issue #490) + * Add the RAID plugin (issue #447) + * Add actions on alerts (issue #132). It is now possible to run action (command line) by triggers. Action could contain {{tag}} (Mustache) with stat value. + * Add InfluxDB export module (--export-influxdb) (issue #455) + * Add StatsD export module (--export-statsd) (issue #465) + * Refactor export module (CSV export option is now --export-csv). It is now possible to export stats from the Glances client mode (issue #463) + * The Web inteface is now based on Bootstrap / RWD grid (issue #417, #366 and #461) Thanks to Nicolas Hart @nclsHart + * It is now possible, through the configuration file, to define if an alarm should be logged or not (using the _log option) (issue #437) + * You can now set alarm for Disk IO + * API: add getAllLimits and getAllViews methods (issue #481) and allow CORS request (issue #479) + * SNMP client support NetApp appliance (issue #394) + +Bugs corrected: + + * R/W error with the glances.log file (issue #474) + +Other enhancement: + + * Alert < 3 seconds are no longer displayed + Version 2.2.1 ============= @@ -1,5 +1,3 @@ -Follow Glances on Twitter: `@nicolargo`_ or `@glances_system`_ - =============================== Glances - An eye on your system =============================== @@ -15,10 +13,9 @@ Glances - An eye on your system .. image:: https://pypip.in/d/Glances/badge.png :target: https://pypi.python.org/pypi/Glances/ :alt: Downloads -.. image:: https://d2weczhvl823v0.cloudfront.net/nicolargo/glances/trend.png - :target: https://bitdeli.com/nicolargo -.. image:: https://badges.gitter.im/Join%20Chat.svg - :target: https://gitter.im/nicolargo/glances?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge + + +Follow Glances on Twitter: `@nicolargo`_ or `@glances_system`_ **Glances** is a cross-platform curses-based system monitoring tool written in Python. @@ -34,14 +31,19 @@ Requirements - ``psutil >= 2.0.0`` - ``setuptools`` -Optional dependencies: +Optionals dependencies: - ``bottle`` (for Web server mode) - ``py3sensors`` (for hardware monitoring support) [Linux-only] - ``hddtemp`` (for HDD temperature monitoring support) [Linux-only] - ``batinfo`` (for battery monitoring support) [Linux-only] +- ``pymdstat`` (for RAID support) [Linux-only] - ``pysnmp`` (for SNMP support) - ``zeroconf`` and ``netifaces`` (for the auto discoverer mode) +- ``influxdb`` (for the InfluxDB export module) +- ``statsd`` (for the StatsD export module) +- ``pystache`` (for the action script feature) +- ``docker-py`` (for the Docker monitoring support) [Linux-only] Installation ============ @@ -49,22 +51,28 @@ Installation Glances Auto Install script --------------------------- -To install both dependacies and latest Glances version, just enter the following command line: +To install both dependencies and latest Glances production ready version (aka *master* branch), just enter the following command line: .. code-block:: console curl -L http://bit.ly/glances | /bin/bash -*Note*: Only supported on some GNU/Linux distributions. -If you want to support others distribs, please contribute to `glancesautoinstall`_. +or + +.. code-block:: console + + wget -O- http://bit.ly/glances | /bin/bash + +*Note*: Only supported on some GNU/Linux distributions. If you want to +support other distributions, please contribute to `glancesautoinstall`_. PyPI: The simple way -------------------- -Glances is on `PyPI`_. By using PyPI, you are sure to have the latest +Glances is on ``PyPI``. By using PyPI, you are sure to have the latest stable version. -To install, simply use `pip`_: +To install, simply use ``pip``: .. code-block:: console @@ -73,12 +81,25 @@ To install, simply use `pip`_: *Note*: Python headers are required to install psutil. For example, on Debian/Ubuntu you need to install first the *python-dev* package. +*Note 2*: You can also install the following libs in order to use optionnal features: + +.. code-block:: console + + pip install bottle batinfo https://bitbucket.org/gleb_zhulik/py3sensors/get/tip.tar.gz zeroconf netifaces pymdstat influxdb statsd pystache + To upgrade Glances to the latest version: .. code-block:: console pip install --upgrade Glances +If you need to install Glances in a specific user location, use: + +.. code-block:: console + + export PYTHONUSERBASE=~/mylocalpath + pip install --user Glances + GNU/Linux --------- @@ -101,12 +122,6 @@ To install the binary package: .. code-block:: console - # pkg_add -r py27-glances - -Using pkgng: - -.. code-block:: console - # pkg install py27-glances To install Glances from ports: @@ -119,7 +134,7 @@ To install Glances from ports: OS X ---- -OS X users can install Glances using `Homebrew`_ or `MacPorts`_. +OS X users can install Glances using ``Homebrew`` or ``MacPorts``. Homebrew ```````` @@ -141,13 +156,13 @@ Windows - Install Python for Windows: http://www.python.org/getit/ - Install the psutil library: https://pypi.python.org/pypi?:action=display&name=psutil#downloads -- Install the `colorconsole`_ library: http://code.google.com/p/colorconsole/downloads/list -- Download Glances from here: http://nicolargo.github.io/glances/ +- Install the colorconsole library: https://pypi.python.org/pypi/colorconsole +- Install Glances Download Glances from here: http://nicolargo.github.io/glances/ Source ------ -To install Glances version X.Y from source: +To install Glances from source: .. code-block:: console @@ -162,7 +177,7 @@ on Debian/Ubuntu you need to install first the *python-dev* package. Puppet ------ -You can install Glances using `Puppet`_: https://github.com/rverchere/puppet-glances +You can install Glances using ``Puppet``: https://github.com/rverchere/puppet-glances Usage ===== @@ -173,7 +188,6 @@ For the standalone mode, just run: $ glances - For the Web server mode, run: .. code-block:: console @@ -196,20 +210,36 @@ on the server side and run: on the client one. -You can also detect and display all Glances servers available on your network or defined in the configuration file: +You can also detect and display all Glances servers available on your +network or defined in the configuration file: .. code-block:: console $ glances --browser -And RTFM, always. +and RTFM, always. Documentation ============= For complete documentation see `glances-doc`_. -If you have any question (after RTFM !), please post it on the official Q&A `forum`_. +If you have any question (after RTFM!), please post it on the official Q&A `forum`_. + +Gateway to other services +========================= + +Glances can export stats to: ``CSV`` file, ``InfluxDB`` and ``StatsD`` server. + +How to contribute ? +=================== + +If you want to contribute to the Glances project, read this `Wiki`_ page. + +There is also a chat dedicated to the Glances' developpers: + +.. image:: https://badges.gitter.im/Join%20Chat.svg + :target: https://gitter.im/nicolargo/glances?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge Author ====== @@ -221,12 +251,10 @@ License LGPL. See ``COPYING`` for more details. -.. _psutil: https://code.google.com/p/psutil/ +.. _psutil: https://github.com/giampaolo/psutil .. _glancesautoinstall: https://github.com/nicolargo/glancesautoinstall .. _@nicolargo: https://twitter.com/nicolargo .. _@glances_system: https://twitter.com/glances_system -.. _PyPI: https://pypi.python.org/pypi -.. _pip: http://www.pip-installer.org/ -.. _colorconsole: https://pypi.python.org/pypi/colorconsole .. _glances-doc: https://github.com/nicolargo/glances/blob/master/docs/glances-doc.rst .. _forum: https://groups.google.com/forum/?hl=en#!forum/glances-users +.. _Wiki: https://github.com/nicolargo/glances/wiki/How-to-contribute-to-Glances-%3F diff --git a/conf/glances-test.conf b/conf/glances-test.conf index a88cb7ea..6e4444bf 100644 --- a/conf/glances-test.conf +++ b/conf/glances-test.conf @@ -3,6 +3,8 @@ user_careful=50 user_warning=70 user_critical=90 +#user_log=False +user_critical_action=echo {{user}} {{value}} {{max}} > /tmp/cpu.alert iowait_careful=50 iowait_warning=70 iowait_critical=90 @@ -12,6 +14,7 @@ system_critical=90 steal_careful=50 steal_warning=70 steal_critical=90 +#steal_log=True [percpu] # Default values if not defined: 50/70/90 @@ -33,6 +36,7 @@ system_critical=90 careful=0.7 warning=1.0 critical=5.0 +#log=False< |