Merge branch 'develop'

liuweihere · May 20, 2015 · fd6c7a8 · fd6c7a8
2 parents b8ae357 + 0e4e18a
commit fd6c7a8
Show file tree

Hide file tree

Showing 122 changed files with 5,802 additions and 4,218 deletions.
diff --git a/AUTHORS b/AUTHORS
@@ -5,25 +5,34 @@ Developers
 Nicolas Hennion (aka) Nicolargo
 http://blog.nicolargo.com
 https://twitter.com/nicolargo
+https://github.com/nicolargo
 [email protected]
 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
+Alessio Sergi (aka) Al3hex
 https://twitter.com/al3hex
+https://github.com/asergi
 
 Brandon Philips (aka) Philips
 http://ifup.org/
+https://github.com/philips
 
 Jon Renner (aka) Jrenner
 https://github.com/jrenner
 
-Maxime Desbrus (aka) desbma
+Maxime Desbrus (aka) Desbma
 https://github.com/desbma
 
-Nicolas Hart (aka) NclsHart for the UI design
+Nicolas Hart (aka) NclsHart (for the Web user interface)
 https://github.com/nclsHart
 
+Sylvain Mouquet (aka) SylvainMouquet (for the Web user interface)
+http://github.com/sylvainmouquet
+
+Floran Brutel (aka) notFloran (for the Web user interface)
+https://github.com/notFloran
+
 =========
 Packagers
 =========

diff --git a/MANIFEST.in b/MANIFEST.in
@@ -3,11 +3,16 @@ include COPYING
 include NEWS
 include README.rst
 include conf/glances.conf
-include glances/outputs/bottle/*.tpl
+include glances/outputs/static/html/*.html
+include glances/outputs/static/html/components/*.html
+include glances/outputs/static/html/plugins/*.html
 include glances/outputs/static/*.ico
 include glances/outputs/static/css/*.css
 include glances/outputs/static/js/*.js
+include glances/outputs/static/js/*.js.map
+include glances/outputs/static/js/vendors/*.js
+include glances/outputs/static/js/vendors/*.js.map
+include glances/outputs/static/images/*.png
 include man/glances.1
 recursive-include docs images/*.png glances-doc.html
 recursive-include glances *.py
-recursive-include i18n *.mo
diff --git a/NEWS b/NEWS
@@ -2,10 +2,47 @@
 Glances Version 2.x
 ==============================================================================
 
+Version 2.4
+===========
+
+Changes:
+
+    * Glances doesn't provide a system-wide configuration file by default anymore.
+      Just copy it in any of the supported locations. See glances-doc.html for
+      more information. (issue #541)
+    * The default key bindings have been changed to:
+      - 'u': sort processes by USER
+      - 'U': show cumulative network I/O
+    * No more translations
+
+Enhancements and new features:
+
+    * The Web user interface is now based on AngularJS (issue #473, #508, #468)
+    * Implement a 'quick look' plugin (issue #505)
+    * Add sort processes by USER (issue #531)
+    * Add a new IP information plugin (issue #509)
+    * Add RabbitMQ export module (issue #540 Thk to @Katyucha)
+    * Add a quiet mode (-q), can be useful using with export module
+    * Grab FAN speed in the Glances sensors plugin (issue #501)
+    * Allow logical mounts points in the FS plugin (issue #448)
+    * Add a --disable-hddtemp to disable HDD temperature module at startup (issue #515)
+    * Increase alert minimal delay to 6 seconds (issue #522) 
+    * If the Curses application raises an exception, restore the terminal correctly (issue #537)
+
+Bugs corrected:
+
+    * Monitor list, all processes are take into account (issue #507)
+    * Duplicated --enable-history in the doc (issue #511)
+    * Sensors title is displayed if no sensors are detected (issue #510)
+    * Server mode issue when no network interface is available (issue #528)
+    * DEBUG mode activated by default with Python 2.6 (issue #512)
+    * Glances display of time trims the hours showing only minutes and seconds (issue #543)
+    * Process list header not decorating when sorting by command (issue #551)
+
 Version 2.3
 ===========
 
-Enhancements and news features:
+Enhancements and new features:
 
     * Add the Docker plugin (issue #440) with per container CPU and memory monitoring (issue #490) 
     * Add the RAID plugin (issue #447)
@@ -37,7 +74,7 @@ Version 2.2.1
 Version 2.2
 ===========
 
-Enhancements and news features:
+Enhancements and new features:
 
     * Add centralized curse interface with a Glances servers list to monitor (issue #418)
     * Add processes tree view (--tree) (issue #444)
@@ -142,7 +179,7 @@ Version 2.0
 ===========
 
     Glances v2.0 is not a simple upgrade of the version 1.x but a complete code refactoring.
-    Based on a plugins system, it aims at providing an easy way to add news features.
+    Based on a plugins system, it aims at providing an easy way to add new features.
     - Core defines the basics and commons functions.
     - all stats are grabbed through plugins (see the glances/plugins source folder).
     - also outputs methods (Curse, Web mode, CSV) are managed as plugins.
@@ -348,7 +385,7 @@ Version 1.4.2.1
 Version 1.4.2
 =============
 
-    * Use the news virtual_memory() and virtual_swap() fct (PsUtil)
+    * Use the new virtual_memory() and virtual_swap() fct (PsUtil)
     * Display "Top process" in logs
     * Minor patch on man page for Debian packaging
     * Code optimization (less try and except)

diff --git a/README.rst b/README.rst
@@ -6,11 +6,11 @@ Glances - An eye on your system
         :target: https://flattr.com/thing/484466/nicolargoglances-on-GitHub
 .. image:: https://scrutinizer-ci.com/g/nicolargo/glances/badges/quality-score.png?b=master
         :target: https://scrutinizer-ci.com/g/nicolargo/glances/
-.. image:: https://travis-ci.org/nicolargo/glances.png?branch=master
+.. image:: https://travis-ci.org/nicolargo/glances.svg?branch=master
         :target: https://travis-ci.org/nicolargo/glances
-.. image:: https://badge.fury.io/py/Glances.png
+.. image:: https://badge.fury.io/py/Glances.svg
         :target: http://badge.fury.io/py/Glances
-.. image:: https://pypip.in/d/Glances/badge.png
+.. image:: https://pypip.in/d/Glances/badge.svg
         :target: https://pypi.python.org/pypi/Glances/
         :alt: Downloads
 
@@ -20,38 +20,40 @@ Follow Glances on Twitter: `@nicolargo`_ or `@glances_system`_
 **Glances** is a cross-platform curses-based system monitoring tool
 written in Python.
 
-It uses the `psutil`_ library to get information from your system.
-
 .. image:: https://raw.github.com/nicolargo/glances/master/docs/images/screenshot-wide.png
 
 Requirements
 ============
 
-- ``python >= 2.6`` (tested with version 2.6, 2.7, 3.3, 3.4)
+- ``python >= 2.6`` or ``>= 3.3`` (tested with version 2.6, 2.7, 3.3, 3.4)
 - ``psutil >= 2.0.0``
 - ``setuptools``
 
-Optionals dependencies:
+Optional 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)
+- ``zeroconf`` (for the autodiscover mode)
+- ``netifaces`` (for the IP plugin)
 - ``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]
+- ``matplotlib`` (for graphical/chart support)
+- ``pika`` (for the RabbitMQ/ActiveMQ export module)
 
 Installation
 ============
 
 Glances Auto Install script
 ---------------------------
 
-To install both dependencies and latest Glances production ready version (aka *master* branch), 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
 
@@ -76,41 +78,42 @@ To install, simply use ``pip``:
 
 .. code-block:: console
 
-    pip install Glances
+    pip install glances
 
 *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:
+You can also install the following libraries in order to use optional
+features:
 
 .. code-block:: console
 
-    pip install bottle batinfo https://bitbucket.org/gleb_zhulik/py3sensors/get/tip.tar.gz zeroconf netifaces pymdstat influxdb statsd pystache
+    pip install bottle batinfo https://bitbucket.org/gleb_zhulik/py3sensors/get/tip.tar.gz zeroconf netifaces pymdstat influxdb statsd pystache pika
 
 To upgrade Glances to the latest version:
 
 .. code-block:: console
 
-    pip install --upgrade Glances
+    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
+    pip install --user glances
 
 GNU/Linux
 ---------
 
 At the moment, packages exist for the following GNU/Linux distributions:
 
 - Arch Linux
-- Debian (Testing/Sid)
+- Debian
 - Fedora/CentOS/RHEL
 - Gentoo
 - Slackware (SlackBuild)
-- Ubuntu (13.04+)
+- Ubuntu
 - Void Linux
 
 So you should be able to install it using your favorite package manager.
@@ -142,7 +145,7 @@ Homebrew
 .. code-block:: console
 
     $ brew install python
-    $ pip install Glances
+    $ pip install glances
 
 MacPorts
 ````````
@@ -154,10 +157,15 @@ MacPorts
 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 Python for Windows (Python 2.7.9+ ship with Pip): http://www.python.org/getit/
+- Install the `psutil`_ library (latest binary version): https://pypi.python.org/pypi/psutil
 - Install the colorconsole library: https://pypi.python.org/pypi/colorconsole
-- Install Glances Download Glances from here: http://nicolargo.github.io/glances/
+- Install optionnals dependencies (see list bellow)
+- Install Glances using pip
+
+.. code-block:: console
+
+    $ pip install glances
 
 Source
 ------
@@ -229,14 +237,14 @@ If you have any question (after RTFM!), please post it on the official Q&A `foru
 Gateway to other services
 =========================
 
-Glances can export stats to: ``CSV`` file, ``InfluxDB`` and ``StatsD`` server.
+Glances can export stats to: ``CSV`` file, ``InfluxDB``, ``StatsD`` and ``RabbitMQ`` 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:
+There is also a chat dedicated to the Glances developers:
 
 .. 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