diff --git a/docs/glances-doc.html b/docs/glances-doc.html index 1f044548..32501916 100644 --- a/docs/glances-doc.html +++ b/docs/glances-doc.html @@ -123,9 +123,9 @@ td.option-group {

Glances

-

This manual describes Glances version 2.0.1.

+

This manual describes Glances version 2.1.

Copyright © 2012-2014 Nicolas Hennion <nicolas@nicolargo.com>

-

June 2014

+

September 2014

Table of Contents

  • Configuration
  • -
  • Anatomy Of The Application
  • @@ -206,7 +207,7 @@ TCP port -p PORT.

    In client mode, you can set the TCP port of the server -p PORT.

    You can also set a password to access to the server --password.

    Default binding address is 0.0.0.0 (Glances will listen on all the -network interfaces) and TCP port is 61209.

    +available network interfaces) and TCP port is 61209.

    In client/server mode, limits are set by the server side.

    Glances is IPv6 compatible. Just use the -B :: option to bind to all IPv6 addresses.

    @@ -215,13 +216,12 @@ client, the latter will try to grab stats using the client$ glances -c @snmpserver -

    Known issues: grab using SNMP is only validated for GNU/Linux with SNMP -v2/2c server.

    +

    Note: Stats grabbed by SNMP request are limited.

    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:

    +device with a web browser, just run on the server:

     server$ glances -w
     
    @@ -239,6 +239,7 @@ http://@server:61208

    Command Reference

    Command-Line Options

    +
    @@ -250,21 +251,16 @@ http://@server:61208 -V, --version - - - - - - - +-d, --debug + + + + @@ -274,7 +270,7 @@ hostname - + @@ -287,6 +283,10 @@ hostname--disable-process + + + @@ -295,16 +295,29 @@ hostname + + + + + + + + + + + - - @@ -325,6 +338,9 @@ file--snmp-auth SNMP_AUTH + + @@ -332,17 +348,40 @@ file - + + + + + + + + + + +
    show program's version number and exit
    --b, --bytedisplay network rate in byte per second
    --B BIND_ADDRESS, --bind BIND_ADDRESS
     bind server to the given IPv4/IPv6 address or hostname
    --c CLIENT, --client CLIENT
     connect to a Glances server by IPv4/IPv6 address or -hostname
    Enable debug mode
    -C CONF_FILE, --config CONF_FILE
     path to the configuration file
    +--enable-history
     enable the history mode
    --disable-bold disable bold mode in the terminal
     disable disk I/O module
    --disable-fsdisable file system module
    disable filesystem module
    --disable-network
     disable process module
    +--disable-process-extended
     disable extended stats on top process
    --disable-log disable log module
     export stats to a CSV file
    +-c CLIENT, --client CLIENT
     connect to a Glances server by IPv4/IPv6 address or +hostname
    +-s, --serverrun Glances in server mode
    -p PORT, --port PORT
     define the client/server TCP port [default: 61209]
    +-B BIND_ADDRESS, --bind BIND_ADDRESS
     bind server to the given IPv4/IPv6 address or hostname
    +--password-badidea PASSWORD_ARG
     define password from the command line
    --password define a client/server password from the prompt or file
    --s, --serverrun Glances in server mode
    --snmp-community SNMP_COMMUNITY
     SNMP authentication key (only for SNMPv3)
    +--snmp-forceforce SNMP mode
    -t TIME, --time TIME
    -w, --webserver
     run Glances in Web server mode
     run Glances in web server mode
    +-f PROCESS_FILTER, --process-filter PROCESS_FILTER
     set the process filter patern (regular expression)
    +--process-short-name
     force short name for processes name
    +-b, --bytedisplay network rate in byte per second
    -1, --percpu start Glances in per CPU mode
    +--theme-whiteoptimize display for white background
    +

    Interactive Commands

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

    +
    ENTER
    +

    Set the process filter +Filter is a regular expression pattern:

    +
      +
    • gnome: all processes starting with the gnome string
    • +
    • .*gnome.*: all processes containing the gnome string
    • +
    +
    a

    Sort process list automatically

      @@ -357,8 +396,12 @@ file
      Sort processes by CPU usage
      d
      Show/hide disk I/O stats
      +
      e
      +
      Enable/disable top extended stats
      f
      Show/hide file system stats
      +
      g
      +
      Generate hraphs for current history
      h
      Show/hide the help screen
      i
      @@ -373,6 +416,8 @@ file
      Sort processes by name
      q
      Quit
      +
      r
      +
      Reset history
      s
      Show/hide sensors stats
      t
      @@ -387,16 +432,17 @@ file
      Show/hide processes stats
      1
      Switch between global CPU and per-CPU stats
      +
      /
      +
      Switch between short name / command line (processes name)

    Configuration

    -

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

    No configuration file is mandatory to use Glances.

    Furthermore a configuration file is needed to set up limits, disks or -network interfaces to hide and/or monitored processes list.

    +network interfaces to hide and/or monitored processes list or to define +alias.

    By default, the configuration file is under:

    @@ -417,6 +463,8 @@ C:\Documents and Settings\<User>\Application Data

    Since Windows Vista and newer versions:

     C:\Users\<User>\AppData\Roaming
    +or
    +%userprofile%\AppData\Roaming
     

    You can override the default configuration, located in one of the above directories on your system, except for Windows.

    @@ -429,10 +477,28 @@ cp /usr/share/doc/glances/glances.conf $XDG_CONFIG_HOME/glances/

    On OS X, you should copy the configuration file to ~/Library/Application Support/glances/.

    +
    +

    Logs and debug mode

    +

    Glances logs all its internal messages to a log file. By default, only +INFO & WARNING & ERROR &CRITICAL levels are logged, but DEBUG messages +can ben logged using the -d option on the command line.

    +

    By default, the configuration file is under:

    +
    +++ + + + + + + +
    Linux, *BSD and OS X:
     /tmp/glances.conf
    Windows:%APPDATA%\Local\temp\glances.conf
    +
    -

    Anatomy Of The Application

    +

    Anatomy Of The Application

    -

    Legend

    +

    Legend

    GREEN stat counter is "OK"
    BLUE stat counter is "CAREFUL"
    @@ -443,7 +509,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 @@ -476,7 +542,7 @@ 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]:

    @@ -496,7 +562,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 @@ -513,7 +579,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).

    @@ -521,18 +587,18 @@ dynamically (bits per second, kbits per second, Mbits per second, etc).

    (see sample in the configuration file).

    Note: it is possibile to define a list of network interfaces to hide and per-interface limit values in the [network] section of the -configuration file.

    +configuration file and aliases for interface name.

    -

    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.

    Note: it is possible to define a list of disks to hide under the -[diskio] section in the configuration file.

    +[diskio] section in the configuration file and aliases for disk name.

    -

    File System

    +

    File System

    images/fs.png

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

    @@ -547,7 +613,7 @@ adapted dynamically.

    the [filesystem] section.

    -

    Sensors

    +

    Sensors

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

    All of the above libraries are available only on Linux.

    @@ -555,11 +621,11 @@ the [filesystem] section.

    temperature only.

    images/sensors.png

    There is no alert on this information.

    -

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

    +

    Note: limit values and sensors alias names can be defined in the configuration +file under the [sensors] section.

    -

    Processes List

    +

    Processes List

    Compact view:

    images/processlist.png

    Full view:

    @@ -612,7 +678,8 @@ automatically sorted by:

    IOW/s
    Per process I/O write rate (in Byte/s)
    COMMAND
    -
    Process command line (process name is highlighted)
    +
    Process command line +User cans switch to the process name by pressing on the / key

    Process status legend:

    @@ -627,11 +694,20 @@ automatically sorted by:

    Z
    Zombie
    +

    In standalone mode, additionals informations are provided for the top process:

    +images/processlist-top.png +
      +
    • CPU affinity (number of cores used by the process)
    • +
    • Extended memory information (swap, shared, text, lib, data and dirty on Linux)
    • +
    • Openned threads, files and network sessions (TCP and UDP)
    • +
    • IO nice level
    • +
    +

    The extended stats feature could be disabled using the --disable-process-extended option (command line) or the e key (curses interface).

    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.

    @@ -683,7 +759,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):

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

    Other Outputs

    +

    Other Outputs

    It is possible to export statistics to CSV file.

     $ glances --output-csv /tmp/glances.csv
    @@ -714,17 +790,21 @@ processes list alerts
     
  • Stats (comma separated)
  • -
    -

    API Documentation

    -

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

    -

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

    +
    +

    APIs Documentations

    +

    Glances includes a XML-RPC server and a RESTFULL-JSON API which and can be used by another client software.

    +

    APIs documentations are available at:

    +
    -

    Support

    +

    Support

    +

    To post a question about Glances use case, please post it to the offical Q&A forum.

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

    -

    Feel free to contribute!

    +

    Feel free to contribute !

    diff --git a/docs/glances-doc.rst b/docs/glances-doc.rst index 2aa751ee..7f5f0b63 100644 --- a/docs/glances-doc.rst +++ b/docs/glances-doc.rst @@ -175,6 +175,12 @@ Interactive Commands The following commands (key pressed) are supported while in Glances: +``ENTER`` + Set the process filter + Filter is a regular expression pattern: + + - gnome: all processes starting with the gnome string + - .*gnome.*: all processes containing the gnome string ``a`` Sort process list automatically @@ -528,11 +534,15 @@ Process status legend: In standalone mode, additionals informations are provided for the top process: +.. image:: images/processlist-top.png + * CPU affinity (number of cores used by the process) * Extended memory information (swap, shared, text, lib, data and dirty on Linux) * Openned threads, files and network sessions (TCP and UDP) * IO nice level +The extended stats feature could be disabled using the --disable-process-extended option (command line) or the ``e`` key (curses interface). + *Note*: limit values can be overwritten in the configuration file under the ``[process]`` section. diff --git a/docs/images/processlist-top.png b/docs/images/processlist-top.png new file mode 100644 index 00000000..dd410c6d Binary files /dev/null and b/docs/images/processlist-top.png differ diff --git a/docs/images/screenshot-wide.png b/docs/images/screenshot-wide.png index a50411ef..5f0a8221 100644 Binary files a/docs/images/screenshot-wide.png and b/docs/images/screenshot-wide.png differ diff --git a/docs/images/screenshot.png b/docs/images/screenshot.png index 0e0e9470..197d34e3 100644 Binary files a/docs/images/screenshot.png and b/docs/images/screenshot.png differ diff --git a/glances/__init__.py b/glances/__init__.py index 8978553b..2ca51a14 100644 --- a/glances/__init__.py +++ b/glances/__init__.py @@ -20,7 +20,7 @@ """Init the Glances software.""" __appname__ = 'glances' -__version__ = '2.1_RC12' +__version__ = '2.1' __author__ = 'Nicolas Hennion ' __license__ = 'LGPL' diff --git a/glances/outputs/glances_curses.py b/glances/outputs/glances_curses.py index 1d5fe796..9c592964 100644 --- a/glances/outputs/glances_curses.py +++ b/glances/outputs/glances_curses.py @@ -475,8 +475,10 @@ class GlancesCurses(object): self.new_column() self.new_line() self.display_plugin(stats_processcount) - self.new_line() - self.display_plugin(stats_monitor) + if glances_processes.get_process_filter() == None and cs_status == 'None': + # Do not display stats monitor list if a filter exist + self.new_line() + self.display_plugin(stats_monitor) self.new_line() self.display_plugin(stats_processlist, display_optional=(screen_x > 102), diff --git a/man/glances.1 b/man/glances.1 index bd26c265..c2389d83 100644 --- a/man/glances.1 +++ b/man/glances.1 @@ -1,4 +1,4 @@ -.TH glances 1 "June, 2014" "version 2.0.1" "USER COMMANDS" +.TH glances 1 "September, 2014" "version 2.1" "USER COMMANDS" .SH NAME glances \- A cross-platform curses-based system monitoring tool .SH SYNOPSIS @@ -25,18 +25,18 @@ display the help and exit .B \-V, \-\-version show program's version number and exit .TP +.B \-d, \-\-debug +Enable debug mode (log file is /tmp/glances.log) +.TP .B \-b, \-\-byte display network rate in byte per second [default: bit per second] .TP -.B \-B BIND_ADDRESS, \-\-bind BIND_ADDRESS -bind server to the given IPv4/IPv6 address or hostname -.TP -.B \-c CLIENT, \-\-client CLIENT -connect to a Glances server by IPv4/IPv6 address or hostname -.TP .B \-C CONF_FILE, \-\-config CONF_FILE path to the configuration file .TP +.B \-\-enable-history +enable the history mode +.TP .B \-\-disable-bold disable bold mode in the terminal .TP @@ -58,20 +58,29 @@ disable sensors module .B \-\-disable-process disable process module .TP +.B \-\-disable-process-extended +disable extended stats on top process +.TP .B \-\-disable-log disable log module .TP .B \-\-output-csv OUTPUT_CSV export stats to a CSV file .TP +.B \-s, \-\-server +run Glances in server mode +.TP +.B \-c CLIENT, \-\-client CLIENT +connect to a Glances server by IPv4/IPv6 address or hostname +.TP .B \-p PORT, \-\-port PORT define the client/server TCP port [default: 61209] .TP .B \-\-password define a client/server password from the prompt or file .TP -.B \-s, \-\-server -run Glances in server mode +.B \-B BIND_ADDRESS, \-\-bind BIND_ADDRESS +bind server to the given IPv4/IPv6 address or hostname .TP .B \-\-snmp-community SNMP_COMMUNITY SNMP community @@ -88,6 +97,9 @@ SNMP username (only for SNMPv3) .B \-\-snmp-auth SNMP_AUTH SNMP authentication key (only for SNMPv3) .TP +.B \-\-snmp-force +Force the SNMP mode (do not try Glances server) +.TP .B \-t TIME, \-\-time TIME set refresh time in seconds [default: 3 sec] .TP @@ -96,9 +108,18 @@ run Glances in Web server mode .TP .B \-1, \-\-percpu start Glances in per CPU mode +.TP +.B \-1, \-\-process-short-name +Force short name for processes name +.TP +.B \-1, \-\-theme-white +Optimize display for white background .SH INTERACTIVE COMMANDS You can use the following keys while in Glances: .TP +.B ENTER +Set the process filter patern (as a regular expression) +.TP .B a Sort process list automatically .TP @@ -111,8 +132,13 @@ Sort processes by CPU usage .B d Show/hide disk I/O stats .TP +.B e +Enable/disable top extended stats +.TP .B f Show/hide file system stats +.B g +Generate graphs for current history .TP .B h Show/hide the help screen @@ -135,6 +161,9 @@ Sort processes by name .B q Quit .TP +.B r +Reset history +.TP .B s Show/hide sensors stats .TP diff --git a/setup.py b/setup.py index 600f4457..1ef63962 100755 --- a/setup.py +++ b/setup.py @@ -6,7 +6,6 @@ import sys from setuptools import setup - def get_data_files(): data_files = [ ('share/doc/glances', ['AUTHORS', 'COPYING', 'NEWS', 'README.rst', @@ -30,7 +29,6 @@ def get_data_files(): return data_files - def get_requires(): requires = ['psutil>=2.0.0'] if sys.platform.startswith('win'): @@ -42,13 +40,13 @@ def get_requires(): setup( name='Glances', - version='2.0.1', + version='2.1', description="A cross-platform curses-based monitoring tool", long_description=open('README.rst').read(), author='Nicolas Hennion', author_email='nicolas@nicolargo.com', url='https://github.com/nicolargo/glances', - # download_url='https://s3.amazonaws.com/glances/glances-2.0.1.tar.gz', + # download_url='https://s3.amazonaws.com/glances/glances-2.1.tar.gz', license="LGPL", keywords="cli curses monitoring system", install_requires=get_requires(),