diff --git a/.gitignore b/.gitignore index 24093e5b..c80ac56e 100644 --- a/.gitignore +++ b/.gitignore @@ -38,8 +38,5 @@ local.properties # ctags .tags* -# Lang -glances.pot - # Sphinx _build diff --git a/.travis.yml b/.travis.yml index f8cf6ea4..8cbebe76 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,5 +5,5 @@ python: - "3.3" - "3.4" install: - - pip install -r requirements.txt --use-mirrors + - pip install -r requirements.txt script: python setup.py install diff --git a/NEWS b/NEWS index 86ed5661..e71f384d 100644 --- a/NEWS +++ b/NEWS @@ -82,7 +82,7 @@ Version 1.7.5 ============= * Force the Pypi installer to use the PsUtil branch 1.x (#333) - + Version 1.7.4 ============= diff --git a/README.rst b/README.rst index 371fb233..6901e1dc 100644 --- a/README.rst +++ b/README.rst @@ -15,8 +15,6 @@ Glances - An eye on your system :alt: Downloads .. image:: https://d2weczhvl823v0.cloudfront.net/nicolargo/glances/trend.png :target: https://bitdeli.com/nicolargo -.. image:: https://raw.github.com/nicolargo/glances/master/docs/images/glances-white-256.png - :width: 128 **Glances** is a cross-platform curses-based system monitoring tool written in Python. diff --git a/docs/glances-doc.html b/docs/glances-doc.html index 0f668877..f584c296 100644 --- a/docs/glances-doc.html +++ b/docs/glances-doc.html @@ -129,43 +129,41 @@ td.option-group {

Table of Contents

-

Introduction

+

Introduction

Glances is a cross-platform curses-based system monitoring tool which aims to present a maximum of information in a minimum of space, ideally to fit in a classical 80x24 terminal or higher to have additional @@ -183,16 +181,16 @@ information from your system.

images/screenshot-web.png
-

Usage

+

Usage

-

Standalone Mode

+

Standalone Mode

Simply run:

 $ glances
-

Client/Server Mode

+

Client/Server Mode

If you want to remotely monitor a machine, called server, from another one, called client, just run on the server:

@@ -221,7 +219,7 @@ client, the latter will try to grab stats using the
-

Web Server Mode

+

Web Server Mode

If you want to remotely monitor a machine, called server, from any device with a web browser, called client, just run on the server:

@@ -238,9 +236,9 @@ http://@server:61208
-

Command Reference

+

Command Reference

-

Command-Line Options

+

Command-Line Options

@@ -342,7 +340,7 @@ file
-

Interactive Commands

+

Interactive Commands

The following commands (key pressed) are supported while in Glances:

a
@@ -393,7 +391,7 @@ file
-

Configuration

+

Configuration

Caution! Glances version 1.x configuration files are not compatible with the version 2.x.

No configuration file is mandatory to use Glances.

@@ -432,9 +430,9 @@ cp /usr/share/doc/glances/glances.conf $XDG_CONFIG_HOME/glances/ ~/Library/Application Support/glances/.

-

Anatomy Of The Application

+

Anatomy Of The Application

-

Legend

+

Legend

GREEN stat counter is "OK"
BLUE stat counter is "CAREFUL"
@@ -445,7 +443,7 @@ cp /usr/share/doc/glances/glances.conf $XDG_CONFIG_HOME/glances/ view.

-

CPU

+

CPU

Short view:

images/cpu.png

If enough horizontal space is available, extended CPU information are @@ -478,9 +476,9 @@ time. The total CPU usage is displayed on the first line.

the [cpu] and/or [percpu] sections.

-

Load

+

Load

images/load.png -

On the No Sheep blog, Zachary Tirrell defines the load average [1]:

+

On the No Sheep blog, Zachary Tirrell defines the load average [1]:

"In short it is the average sum of the number of processes waiting in the run-queue plus the number currently executing @@ -498,7 +496,7 @@ The first line also displays the number of CPU core.

the [load] section.

-

Memory

+

Memory

Glances uses two columns: one for the RAM and one for the SWAP.

images/mem.png

If enough space is available, Glances displays extended information for @@ -515,7 +513,7 @@ the RAM:

the [memory] and/or [memswap] sections.

-

Network

+

Network

images/network.png

Glances displays the network interface bit rate. The unit is adapted dynamically (bits per second, kbits per second, Mbits per second, etc).

@@ -526,7 +524,7 @@ and per-interface limit values in the [network]
-

Disk I/O

+

Disk I/O

images/diskio.png

Glances displays the disk I/O throughput. The unit is adapted dynamically.

There is no alert on this information.

@@ -534,7 +532,7 @@ configuration file.

[diskio] section in the configuration file.

-

File System

+

File System

images/fs.png

Glances displays the used and total file system disk space. The unit is adapted dynamically.

@@ -549,9 +547,9 @@ adapted dynamically.

the [filesystem] section.

-

Sensors

+

Sensors

Glances can displays the sensors information using lm-sensors, -hddtemp and batinfo [2].

+hddtemp and batinfo [2].

All of the above libraries are available only on Linux.

As of lm-sensors, a filter is being applied in order to display temperature only.

@@ -561,7 +559,7 @@ temperature only.

the [sensors] section.

-

Processes List

+

Processes List

Compact view:

images/processlist.png

Full view:

@@ -596,7 +594,7 @@ automatically sorted by:

MEM%
% of MEM used by the process
VIRT
-
Total program size aka Virtual Memory Size (VMS)
+
Total program size - Virtual Memory Size (VMS)
RES
Resident Set Size (RSS)
PID
@@ -629,11 +627,11 @@ automatically sorted by:

Z
Zombie
-

Note: limits values can be overwritten in the configuration file under +

Note: limit values can be overwritten in the configuration file under the [process] section.

-

Monitored Processes List

+

Monitored Processes List

The monitored processes list allows user, through the configuration file, to group processes and quickly show if the number of running processes is not good.

@@ -685,7 +683,7 @@ get the JSON representation of the monitored processes list.

-

Logs

+

Logs

images/logs.png

A log messages list is displayed in the bottom of the screen if (and only if):

@@ -705,7 +703,7 @@ processes list alerts
-

Other Outputs

+

Other Outputs

It is possible to export statistics to CSV file.

 $ glances --output-csv /tmp/glances.csv
@@ -717,56 +715,23 @@ processes list alerts
-

API Documentation

+

API Documentation

Glances uses a XML-RPC server and can be used by another client software.

-

<<<<<<< HEAD -API documentation is available at https://github.com/nicolargo/glances/wiki/The-Glances-API-How-To

-
-
-

Other outputs

-

Thanks to the -o (output) option, it is possible to export statistics to CSV or HTML files.

-
-$ glances -o CSV -f /tmp
-
-

The CSV output file is named glances.csv.

-

CSV files have on line per stats:

- -
-$ glances -o HTML -f /tmp
-
-

The HTML output file is named glances.html.

-
-
-

Note: The css and img folders (glances/data) should be in the /tmp folder.

-
-

System Message: WARNING/2 (./docs/glances-doc.rst, line 628)

-

Title underline too short.

-
-*Note*: The css and img folders (glances/data) should be in the /tmp folder.
-=======
-
-

API documentation is available at -https://github.com/nicolargo/glances/wiki/The-Glances-2.x-API-How-to. ->>>>>>> release/v2.0

+https://github.com/nicolargo/glances/wiki/The-Glances-2.x-API-How-to.

-

Support

+

Support

To report a bug or a feature request use the bug tracking system at https://github.com/nicolargo/glances/issues.

Feel free to contribute!

- +
[1]http://nosheep.net/story/defining-unix-load-average/
- +
diff --git a/docs/glances-doc.rst b/docs/glances-doc.rst index cea11d38..2eb929ff 100644 --- a/docs/glances-doc.rst +++ b/docs/glances-doc.rst @@ -462,7 +462,7 @@ The number of processes in the list is adapted to the screen size. ``MEM%`` % of MEM used by the process ``VIRT`` - Total program size aka Virtual Memory Size (VMS) + Total program size - Virtual Memory Size (VMS) ``RES`` Resident Set Size (RSS) ``PID`` @@ -495,7 +495,7 @@ Process status legend: ``Z`` Zombie -*Note*: limits values can be overwritten in the configuration file under +*Note*: limit values can be overwritten in the configuration file under the ``[process]`` section. Monitored Processes List @@ -597,38 +597,8 @@ API Documentation Glances uses a `XML-RPC server`_ and can be used by another client software. -<<<<<<< HEAD -API documentation is available at https://github.com/nicolargo/glances/wiki/The-Glances-API-How-To - -Other outputs -============= - -Thanks to the -o (output) option, it is possible to export statistics to `CSV` or `HTML` files. - -.. code-block:: console - - $ glances -o CSV -f /tmp - -The CSV output file is named ``glances.csv``. - -CSV files have on line per stats: - -- load,load1,load5,load15 -- mem,total,used,free -- swap,total,used,free -- cpu,user,system,nice,idle,iowait,irq - -.. code-block:: console - - $ glances -o HTML -f /tmp - -The HTML output file is named ``glances.html``. - -*Note*: The css and img folders (glances/data) should be in the /tmp folder. -======= API documentation is available at https://github.com/nicolargo/glances/wiki/The-Glances-2.x-API-How-to. ->>>>>>> release/v2.0 Support ======= diff --git a/man/glances.1 b/man/glances.1 index 08b87183..cd3e9c0a 100644 --- a/man/glances.1 +++ b/man/glances.1 @@ -1,17 +1,9 @@ -<<<<<<< HEAD -.TH glances 1 "May, 2014" "version 1.7.7" "USER COMMANDS" -======= .TH glances 1 "June, 2014" "version 2.0" "USER COMMANDS" ->>>>>>> release/v2.0 .SH NAME glances \- A cross-platform curses-based system monitoring tool .SH SYNOPSIS .B glances -<<<<<<< HEAD -[\-bdehmnrsvyz1] [\-B bind] [\-c server] [\-C conffile] [\-p port] [\-P password] [\-\-password] [\-t refresh] [\-f file] [\-o output] -======= .RI [ OPTIONS ] ->>>>>>> release/v2.0 .SH DESCRIPTION Glances is a free (LGPL) cross-platform curses-based system monitoring tool which aims to present a maximum of information in a minimum of space, ideally to fit in @@ -45,13 +37,8 @@ connect to a Glances server by IPv4/IPv6 address or hostname .B \-C CONF_FILE, \-\-config CONF_FILE path to the configuration file .TP -<<<<<<< HEAD -.B \-f FOLDER -Set the HTML or CSV output folder -======= .B \-\-disable-bold disable bold mode in the terminal ->>>>>>> release/v2.0 .TP .B \-\-disable-diskio disable disk I/O module diff --git a/setup.py b/setup.py index 7fae26f2..e087cd7d 100755 --- a/setup.py +++ b/setup.py @@ -75,7 +75,6 @@ setup( 'Programming Language :: Python :: 2.6', 'Programming Language :: Python :: 2.7', 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.2', 'Programming Language :: Python :: 3.3', 'Programming Language :: Python :: 3.4' ]
[2]https://github.com/nicolargo/batinfo