Merge branch 'develop'

.travis.yml

@@ -3,12 +3,13 @@ python:
   - "2.7"
   - "3.3"
   - "3.4"
+  - "3.5"
   - "pypy"
 install:
   - pip install -r requirements.txt
   - pip install coveralls
-script: 
+script:
   - python setup.py install
   - coverage run --source=glances unitest.py
 after_success:
-  - coveralls
+  - coveralls

AUTHORS

@@ -8,7 +8,7 @@ https://twitter.com/nicolargo
 https://github.com/nicolargo
 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 
+PGP Public key:  gpg --keyserver pgp.mit.edu --recv-keys 0xaba4d1ab97316a3c
 
 Alessio Sergi (aka) Al3hex
 https://twitter.com/al3hex
@@ -37,8 +37,8 @@ https://github.com/notFloran
 Packagers
 =========
 
-Rémi Verchère for the Debian package
-https://github.com/rverchere/debian-glances
+Daniel Echeverry and Sebastien Badia for the Debian package
+https://mentors.debian.net/package/glances
 
 Philip Lacroix for the Slackware (SlackBuild) package
 

CONTRIBUTING.md

@@ -122,7 +122,9 @@ included in the project:
    git checkout -b <topic-branch-name>
    ```
 
-4. Commit your changes in logical chunks. Please adhere to these [git commit
+4. It's coding time !
+   Please respect the following coding convention: [Elements of Python Style](https://github.com/amontalenti/elements-of-python-style)
+   Commit your changes in logical chunks. Please adhere to these [git commit
    message guidelines](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html)
    or your code is unlikely be merged into the main project. Use Git's
    [interactive rebase](https://help.github.com/articles/interactive-rebase)

Dockerfile

@@ -0,0 +1,24 @@
+#
+# Glances Dockerfile
+#
+# https://github.com/nicolargo/glances
+#
+
+# Pull base image.
+FROM ubuntu
+
+# Install Glances (develop branch)
+RUN apt-get -y install curl && \
+    curl -L https://raw.githubusercontent.com/nicolargo/glancesautoinstall/master/install-develop.sh | /bin/bash
+
+# Define working directory.
+WORKDIR /glances
+
+# EXPOSE PORT (For XMLRPC)
+EXPOSE 61209
+
+# EXPOSE PORT (For Web UI)
+EXPOSE 61208
+
+# Define default command.
+CMD python -m glances $GLANCES_OPT

MANIFEST.in

@@ -3,17 +3,6 @@ include COPYING
 include NEWS
 include README.rst
 include conf/glances.conf
-include glances/outputs/static/html/*.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/services/core/*.js
-include glances/outputs/static/js/services/plugins/*.js
-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 docs *
 recursive-include glances *.py
+recursive-include glances/outputs/static *

NEWS

@@ -2,6 +2,61 @@
 Glances Version 2
 ==============================================================================
 
+Version 2.6
+===========
+
+Deprecations:
+
+    * Add deprecation warning for Python 2.6.
+      Python 2.6 support will be dropped in future releases.
+      Please switch to at least Python 2.7 or 3.3+ as soon as possible.
+      See http://www.snarky.ca/stop-using-python-2-6 for more information.
+
+Enhancements and new features:
+
+    * Add a connector to ElasticSearch (welcome to Kibana dashboard) (issue #311)
+    * New folders' monitoring plugins (issue #721)
+    * Use wildcard (regexp) to the hide configuration option for network, diskio and fs sections (issue #799 )
+    * Command line arguments are now take into account in the WebUI (#789 by  @notFloran)
+    * Change username for server and web server authentication (issue #693)
+    * Add an option to disable top menu (issue #766)
+    * Add IOps in the DiskIO plugin (issue #763)
+    * Add hide configuration key for FS Plugin (issue #736)
+    * Add process summary min/max stats (issue #703)
+    * Add timestamp to the CSV export module (issue #708)
+    * Add a shortcut 'E' to delete process filter (issue #699)
+    * By default, hide disk I/O ram1-** (issue #714)
+    * When Glances is starting the notifications should be delayed (issue #732)
+    * Add option (--disable-bg) to disable ANSI background colours (issue #738 by okdana)
+    * [WebUI] add "pointer" cursor for sortable columns (issue #704 by @notFloran)
+    * [WebUI] Make web page title configurable (issue #724)
+    * Do not show interface in down state (issue #765)
+    * InfluxDB > 0.9.3 needs float and not int for numerical value (issue#749 and issue#750 by nicolargo)
+
+Bugs corrected:
+    * Can't read sensors on a Thinkpad (issue #711)
+    * InfluxDB/OpenTSDB: tag parsing broken (issue #713)
+    * Grafana Dashboard outdated for InfluxDB 0.9.x (issue #648)
+    * '--tree' breaks process filter on Debian 8 (issue #768)
+    * Fix highlighting of process when it contains whitespaces (issue #546 by Alessio Sergi)
+    * Fix RAID support in Python 3 (issue #793 by Alessio Sergi)
+    * Use dict view objects to avoid issue (issue #758 by Alessio Sergi)
+    * System exit if Cpu not supported by the Cpuinfo lib (issue #754 by nicolargo)
+    * KeyError: 'cpucore' when exporting data to InfluxDB (issue #729) by nicolargo)
+
+Others:
+    * A new Glances docker container to monitor your Docker infrastructure is available here (issue #728): https://hub.docker.com/r/nicolargo/glances/
+    * Documentation is now generated automatically thanks to Sphinx and the Alessio Sergi patch (http://glances.readthedocs.org/en/latest/)
+
+Contributors summary:
+    * Nicolas Hennion: 112 commits
+    * Alessio Sergi: 55 commits
+    * Floran Brutel: 19 commits
+    * Nicolas Hart: 8 commits
+    * @desbma: 4 commits
+    * @dana: 2 commits
+    * Damien Martin, Raju Kadam, @georgewhewell: 1 commit
+
 Version 2.5.1
 =============
 

README.rst

@@ -3,20 +3,22 @@ Glances - An eye on your system
 ===============================
 
 
+.. image:: https://img.shields.io/pypi/v/glances.svg
+    :target: https://pypi.python.org/pypi/Glances
 .. image:: https://img.shields.io/pypi/dm/glances.svg
     :target: https://pypi.python.org/pypi/glances#downloads
     :alt: Downloads this month
 .. image:: https://img.shields.io/github/stars/nicolargo/glances.svg
     :target: https://github.com/nicolargo/glances/
     :alt: Github stars
 .. image:: https://travis-ci.org/nicolargo/glances.svg?branch=master
-        :target: https://travis-ci.org/nicolargo/glances
-.. image:: https://img.shields.io/pypi/v/glances.svg
-        :target: https://pypi.python.org/pypi/Glances
+    :target: https://travis-ci.org/nicolargo/glances
+.. image:: https://circleci.com/gh/nicolargo/glances/tree/develop.svg?style=svg
+    :target: https://circleci.com/gh/nicolargo/glances/tree/develop
 .. image:: https://img.shields.io/scrutinizer/g/nicolargo/glances.svg
-        :target: https://scrutinizer-ci.com/g/nicolargo/glances/
+    :target: https://scrutinizer-ci.com/g/nicolargo/glances/
 .. image:: https://api.flattr.com/button/flattr-badge-large.png
-        :target: https://flattr.com/thing/484466/nicolargoglances-on-GitHub
+    :target: https://flattr.com/thing/484466/nicolargoglances-on-GitHub
 
 Follow Glances on Twitter: `@nicolargo`_ or `@glances_system`_
 
@@ -28,7 +30,7 @@ written in Python.
 Requirements
 ============
 
-- ``python >= 2.6`` or ``>= 3.3`` (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, 3.5)
 - ``psutil >= 2.0.0``
 - ``setuptools``
 
@@ -49,12 +51,15 @@ Optional dependencies:
 - ``matplotlib`` (for graphical/chart support)
 - ``pika`` (for the RabbitMQ/ActiveMQ export module)
 - ``py-cpuinfo`` (for the Quicklook CPU info module)
+- ``scandir`` (for the Folders plugin) [Only for Python < 3.5]
 
 Installation
 ============
 
-Glances Auto Install script
----------------------------
+Several method to test/install Glances on your system. Choose your weapon !
+
+Glances Auto Install script: the total way
+------------------------------------------
 
 To install both dependencies and latest Glances production ready version
 (aka *master* branch), just enter the following command line:
@@ -93,7 +98,7 @@ features (like the Web interface):
 
 .. code-block:: console
 
-    pip install bottle batinfo https://bitbucket.org/gleb_zhulik/py3sensors/get/tip.tar.gz zeroconf netifaces pymdstat influxdb potsdb statsd pystache docker-py pysnmp pika py-cpuinfo
+    pip install bottle batinfo https://bitbucket.org/gleb_zhulik/py3sensors/get/tip.tar.gz zeroconf netifaces pymdstat influxdb potsdb statsd pystache docker-py pysnmp pika py-cpuinfo scandir
 
 Install or upgrade Glances from the Git ``develop`` repository:
 
@@ -115,6 +120,24 @@ If you need to install Glances in a specific user location, use:
     export PYTHONUSERBASE=~/mylocalpath
     pip install --user glances
 
+Docker: the funny way
+---------------------
+
+A Glances container is available. It will include the latest development HEAD version. You can use it to monitor your server and all your others containers !
+
+Get the Glances container:
+
+.. code-block:: console
+
+    docker pull nicolargo/glances
+
+Run the container in console mode:
+
+.. code-block:: console
+
+    docker run -v /var/run/docker.sock:/var/run/docker.sock:ro --pid host -it docker.io/nicolargo/glances
+
+
 GNU/Linux
 ---------
 
@@ -190,6 +213,11 @@ To install Glances from source:
 *Note*: Python headers are required to install psutil. For example,
 on Debian/Ubuntu you need to install first the *python-dev* package.
 
+Chef
+----
+
+An awesome ``Chef`` cookbook is available to monitor your infrastructure: https://supermarket.chef.io/cookbooks/glances (thanks to Antoine Rouyer)
+
 Puppet
 ------
 
@@ -238,7 +266,7 @@ and RTFM, always.
 Documentation
 =============
 
-For complete documentation see `glances-doc`_.
+For complete documentation have a look at the readthedocs_ website.
 
 If you have any question (after RTFM!), please post it on the official Q&A `forum`_.
 
@@ -273,6 +301,6 @@ LGPL. See ``COPYING`` for more details.
 .. _@nicolargo: https://twitter.com/nicolargo
 .. _@glances_system: https://twitter.com/glances_system
 .. _Python: https://www.python.org/getit/
-.. _glances-doc: https://github.com/nicolargo/glances/blob/master/docs/glances-doc.rst
+.. _readthedocs: https://glances.readthedocs.org/
 .. _forum: https://groups.google.com/forum/?hl=en#!forum/glances-users
 .. _wiki: https://github.com/nicolargo/glances/wiki/How-to-contribute-to-Glances-%3F