diff options
| author | nicolargo <nicolashennion@gmail.com> | 2015-05-20 10:12:34 +0200 |
|---|---|---|
| committer | nicolargo <nicolashennion@gmail.com> | 2015-05-20 10:12:34 +0200 |
| commit | 0e4e18a3eb14a7744680812087d52be1a142e48c (patch) | |
| tree | ed5f136b8fc5de69ef6ee8bacb55884274cae754 | |
| parent | 7d28fe802037bf377f94868a7be0991dd352f4d5 (diff) | |
Update screenshots and documentation
| -rw-r--r-- | AUTHORS | 2 | ||||
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | README.rst | 2 | ||||
| -rw-r--r-- | docs/glances-doc.html | 80 | ||||
| -rw-r--r-- | docs/images/screenshot-web.png | bin | 202285 -> 264464 bytes | |||
| -rw-r--r-- | docs/images/screenshot-web2.png | bin | 247944 -> 164736 bytes | |||
| -rw-r--r-- | docs/images/screenshot-wide.png | bin | 437692 -> 613972 bytes | |||
| -rw-r--r-- | docs/images/screenshot.png | bin | 186560 -> 508044 bytes | |||
| -rw-r--r-- | glances/__init__.py | 2 | ||||
| -rwxr-xr-x | setup.py | 2 |
10 files changed, 48 insertions, 41 deletions
@@ -30,6 +30,8 @@ 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 @@ -37,6 +37,7 @@ Bugs corrected: * 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 =========== @@ -158,7 +158,7 @@ Windows ------- - 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 `psutil`_ library (latest binary version): https://pypi.python.org/pypi/psutil - Install the colorconsole library: https://pypi.python.org/pypi/colorconsole - Install optionnals dependencies (see list bellow) - Install Glances using pip diff --git a/docs/glances-doc.html b/docs/glances-doc.html index 0674f032..85b22d7a 100644 --- a/docs/glances-doc.html +++ b/docs/glances-doc.html @@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> -<meta name="generator" content="Docutils 0.12: http://docutils.sourceforge.net/" /> +<meta name="generator" content="Docutils 0.11: http://docutils.sourceforge.net/" /> <title>Glances</title> <style type="text/css"> @@ -125,7 +125,7 @@ td.option-group { <p>This manual describes <em>Glances</em> version 2.4.</p> <p>Copyright © 2011-2015 Nicolas Hennion <<a class="reference external" href="mailto:nicolas@nicolargo.com">nicolas@nicolargo.com</a>></p> -<p>April 2015</p> +<p>May 2015</p> <div class="contents topic" id="table-of-contents"> <p class="topic-title first">Table of Contents</p> <ul class="simple"> @@ -280,29 +280,25 @@ http://@server:61208/10 <td>show program's version number and exit</td></tr> <tr><td class="option-group"> <kbd><span class="option">-d</span>, <span class="option">--debug</span></kbd></td> -<td>Enable debug mode</td></tr> +<td>enable debug mode</td></tr> <tr><td class="option-group" colspan="2"> <kbd><span class="option">-C <var>CONF_FILE</var></span>, <span class="option">--config <var>CONF_FILE</var></span></kbd></td> </tr> <tr><td> </td><td>path to the configuration file</td></tr> <tr><td class="option-group" colspan="2"> -<kbd><span class="option">--enable-history</span></kbd></td> +<kbd><span class="option">--disable-network</span></kbd></td> </tr> -<tr><td> </td><td>enable the history mode</td></tr> +<tr><td> </td><td>disable network module</td></tr> <tr><td class="option-group"> -<kbd><span class="option">--disable-bold</span></kbd></td> -<td>disable bold mode in the terminal</td></tr> +<kbd><span class="option">--disable-ip</span></kbd></td> +<td>disable IP module</td></tr> <tr><td class="option-group" colspan="2"> <kbd><span class="option">--disable-diskio</span></kbd></td> </tr> <tr><td> </td><td>disable disk I/O module</td></tr> <tr><td class="option-group"> <kbd><span class="option">--disable-fs</span></kbd></td> -<td>disable filesystem module</td></tr> -<tr><td class="option-group" colspan="2"> -<kbd><span class="option">--disable-network</span></kbd></td> -</tr> -<tr><td> </td><td>disable network module</td></tr> +<td>disable file system module</td></tr> <tr><td class="option-group" colspan="2"> <kbd><span class="option">--disable-sensors</span></kbd></td> </tr> @@ -310,11 +306,19 @@ http://@server:61208/10 <tr><td class="option-group" colspan="2"> <kbd><span class="option">--disable-hddtemp</span></kbd></td> </tr> -<tr><td> </td><td>disable HDDTemp module</td></tr> +<tr><td> </td><td>disable hddtemp module</td></tr> +<tr><td class="option-group"> +<kbd><span class="option">--disable-raid</span></kbd></td> +<td>disable RAID module</td></tr> +<tr><td class="option-group" colspan="2"> +<kbd><span class="option">--disable-docker</span></kbd></td> +</tr> +<tr><td> </td><td>disable Docker module</td></tr> <tr><td class="option-group" colspan="2"> <kbd><span class="option">--disable-left-sidebar</span></kbd></td> </tr> -<tr><td> </td><td>disable left sidebar</td></tr> +<tr><td> </td><td>disable network, disk I/O, file system and +sensors modules (py3sensors needed)</td></tr> <tr><td class="option-group" colspan="2"> <kbd><span class="option">--disable-process</span></kbd></td> </tr> @@ -323,33 +327,40 @@ http://@server:61208/10 <kbd><span class="option">--disable-log</span></kbd></td> <td>disable log module</td></tr> <tr><td class="option-group" colspan="2"> +<kbd><span class="option">--disable-quicklook</span></kbd></td> +</tr> +<tr><td> </td><td>disable quick look module</td></tr> +<tr><td class="option-group"> +<kbd><span class="option">--disable-bold</span></kbd></td> +<td>disable bold mode in the terminal</td></tr> +<tr><td class="option-group" colspan="2"> <kbd><span class="option">--enable-process-extended</span></kbd></td> </tr> <tr><td> </td><td>enable extended stats on top process</td></tr> <tr><td class="option-group" colspan="2"> -<kbd><span class="option">--disable-quicklook</span></kbd></td> +<kbd><span class="option">--enable-history</span></kbd></td> </tr> -<tr><td> </td><td>disable the Quicklook module</td></tr> +<tr><td> </td><td>enable the history mode (matplotlib needed)</td></tr> <tr><td class="option-group" colspan="2"> <kbd><span class="option">--path-history <var>PATH_HISTORY</var></span></kbd></td> </tr> -<tr><td> </td><td>Set the export path for graph history</td></tr> +<tr><td> </td><td>set the export path for graph history</td></tr> <tr><td class="option-group" colspan="2"> -<kbd><span class="option">--export-csv <var>CSV_FILE</var></span></kbd></td> +<kbd><span class="option">--export-csv <var>EXPORT_CSV</var></span></kbd></td> </tr> <tr><td> </td><td>export stats to a CSV file</td></tr> <tr><td class="option-group" colspan="2"> <kbd><span class="option">--export-influxdb</span></kbd></td> </tr> -<tr><td> </td><td>export stats to an InfluxDB server</td></tr> +<tr><td> </td><td>export stats to an InfluxDB server (influxdb needed)</td></tr> <tr><td class="option-group" colspan="2"> <kbd><span class="option">--export-statsd</span></kbd></td> </tr> -<tr><td> </td><td>export stats to a Statsd server</td></tr> +<tr><td> </td><td>export stats to a StatsD server (statsd needed)</td></tr> <tr><td class="option-group" colspan="2"> <kbd><span class="option">--export-rabbitmq</span></kbd></td> </tr> -<tr><td> </td><td>export stats to a RabbitMQ server</td></tr> +<tr><td> </td><td>export stats to a RabbitMQ server (pika needed)</td></tr> <tr><td class="option-group" colspan="2"> <kbd><span class="option">-c <var>CLIENT</var></span>, <span class="option">--client <var>CLIENT</var></span></kbd></td> </tr> @@ -360,7 +371,7 @@ hostname</td></tr> <td>run Glances in server mode</td></tr> <tr><td class="option-group"> <kbd><span class="option">--browser</span></kbd></td> -<td>run the Glances client browser (list of Glances server)</td></tr> +<td>start the client browser (list of Glances servers)</td></tr> <tr><td class="option-group" colspan="2"> <kbd><span class="option">--disable-autodiscover</span></kbd></td> </tr> @@ -373,18 +384,9 @@ hostname</td></tr> <kbd><span class="option">-B <var>BIND_ADDRESS</var></span>, <span class="option">--bind <var>BIND_ADDRESS</var></span></kbd></td> </tr> <tr><td> </td><td>bind server to the given IPv4/IPv6 address or hostname</td></tr> -<tr><td class="option-group" colspan="2"> -<kbd><span class="option">--password-badidea <var>PASSWORD_ARG</var></span></kbd></td> -</tr> -<tr><td> </td><td>define password from the command line</td></tr> <tr><td class="option-group"> <kbd><span class="option">--password</span></kbd></td> -<td>define a client/server password from the prompt or -file</td></tr> -<tr><td class="option-group" colspan="2"> -<kbd><span class="option">--disable-autodiscover</span></kbd></td> -</tr> -<tr><td> </td><td>Hide Glances server from the auto discover feature</td></tr> +<td>define a client/server password</td></tr> <tr><td class="option-group" colspan="2"> <kbd><span class="option">--snmp-community <var>SNMP_COMMUNITY</var></span></kbd></td> </tr> @@ -415,14 +417,14 @@ file</td></tr> <tr><td class="option-group" colspan="2"> <kbd><span class="option">-w</span>, <span class="option">--webserver</span></kbd></td> </tr> -<tr><td> </td><td>run Glances in web server mode</td></tr> +<tr><td> </td><td>run Glances in web server mode (bottle needed)</td></tr> <tr><td class="option-group"> <kbd><span class="option">-q</span>, <span class="option">--quiet</span></kbd></td> -<td>run Glances in quiet mode (nothing is displayed)</td></tr> +<td>do not display the curses interface</td></tr> <tr><td class="option-group" colspan="2"> <kbd><span class="option">-f <var>PROCESS_FILTER</var></span>, <span class="option">--process-filter <var>PROCESS_FILTER</var></span></kbd></td> </tr> -<tr><td> </td><td>set the process filter patern (regular expression)</td></tr> +<tr><td> </td><td>set the process filter pattern (regular expression)</td></tr> <tr><td class="option-group" colspan="2"> <kbd><span class="option">--process-short-name</span></kbd></td> </tr> @@ -443,7 +445,7 @@ file</td></tr> <tr><td class="option-group" colspan="2"> <kbd><span class="option">--fs-free-space</span></kbd></td> </tr> -<tr><td> </td><td>display FS free space instead of used</td></tr> +<tr><td> </td><td>display file system free space instead of used</td></tr> <tr><td class="option-group"> <kbd><span class="option">--theme-white</span></kbd></td> <td>optimize display colors for white background</td></tr> @@ -482,7 +484,7 @@ Filter is a regular expression pattern:</p> <dt><tt class="docutils literal">f</tt></dt> <dd>Show/hide file system stats</dd> <dt><tt class="docutils literal">F</tt></dt> -<dd>Switch between FS used and free space</dd> +<dd>Switch between file system used and free space</dd> <dt><tt class="docutils literal">g</tt></dt> <dd>Generate graphs for current history</dd> <dt><tt class="docutils literal">h</tt></dt> @@ -508,6 +510,8 @@ Filter is a regular expression pattern:</p> <dt><tt class="docutils literal">T</tt></dt> <dd>View network I/O as combination</dd> <dt><tt class="docutils literal">u</tt></dt> +<dd>Sort processes by USER</dd> +<dt><tt class="docutils literal">U</tt></dt> <dd>View cumulative network I/O</dd> <dt><tt class="docutils literal">w</tt></dt> <dd>Delete finished warning log messages</dd> @@ -520,7 +524,7 @@ Filter is a regular expression pattern:</p> <dt><tt class="docutils literal">2</tt></dt> <dd>Enable/disable left sidebar</dd> <dt><tt class="docutils literal">3</tt></dt> -<dd>Enable/disable the Quicklook module</dd> +<dd>Enable/disable the quick look module</dd> <dt><tt class="docutils literal">/</tt></dt> <dd>Switch between short name / command line (processes name)</dd> </dl> diff --git a/docs/images/screenshot-web.png b/docs/images/screenshot-web.png Binary files differindex 12644037..8467f863 100644 --- a/docs/images/screenshot-web.png +++ b/docs/images/screenshot-web.png diff --git a/docs/images/screenshot-web2.png b/docs/images/screenshot-web2.png Binary files differindex 30b3c997..786250f4 100644 --- a/docs/images/screenshot-web2.png +++ b/docs/images/screenshot-web2.png diff --git a/docs/images/screenshot-wide.png b/docs/images/screenshot-wide.png Binary files differindex 5f0a8221..2acf5340 100644 --- a/docs/images/screenshot-wide.png +++ b/docs/images/screenshot-wide.png diff --git a/docs/images/screenshot.png b/docs/images/screenshot.png Binary files differindex 197d34e3..3d34a6d0 100644 --- a/docs/images/screenshot.png +++ b/docs/images/screenshot.png diff --git a/glances/__init__.py b/glances/__init__.py index a195f788..68a8803f 100644 --- a/glances/__init__.py +++ b/glances/__init__.py @@ -20,7 +20,7 @@ """Init the Glances software.""" __appname__ = 'glances' -__version__ = '2.4RC2' +__version__ = '2.4' __author__ = 'Nicolas Hennion <nicolas@nicolargo.com>' __license__ = 'LGPL' @@ -33,7 +33,7 @@ def get_requires(): setup( name='Glances', - version='2.4RC2', + version='2.4', description="A cross-platform curses-based monitoring tool", long_description=open('README.rst').read(), author='Nicolas Hennion', |
