diff options
| -rw-r--r-- | AUTHORS | 5 | ||||
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | MANIFEST.in | 2 | ||||
| -rw-r--r-- | Makefile | 10 | ||||
| -rw-r--r-- | NEWS | 25 | ||||
| -rw-r--r-- | README | 52 | ||||
| -rw-r--r-- | README-fr | 27 | ||||
| -rw-r--r-- | README.md | 52 | ||||
| -rw-r--r-- | TODO | 2 | ||||
| -rw-r--r-- | doc/cpu.png | bin | 4744 -> 4155 bytes | |||
| -rw-r--r-- | doc/footer.png | bin | 6072 -> 2953 bytes | |||
| -rw-r--r-- | doc/header.png | bin | 7602 -> 4162 bytes | |||
| -rw-r--r-- | doc/mem.png | bin | 8524 -> 7789 bytes | |||
| -rw-r--r-- | doc/processlist.png | bin | 19941 -> 47466 bytes | |||
| -rw-r--r-- | screenshot.png | bin | 95627 -> 143074 bytes | |||
| -rwxr-xr-x | setup.py | 10 | ||||
| -rw-r--r-- | src/__init__.py (renamed from glances/__init__.py) | 0 | ||||
| -rw-r--r-- | src/css/default.css (renamed from glances/css/default.css) | 0 | ||||
| -rwxr-xr-x | src/glances.py (renamed from glances/glances.py) | 2 | ||||
| -rw-r--r-- | src/html/base.html (renamed from glances/html/base.html) | 0 | ||||
| -rw-r--r-- | src/html/default.html (renamed from glances/html/default.html) | 0 | ||||
| -rw-r--r-- | src/img/bg.png (renamed from glances/img/bg.png) | bin | 20623 -> 20623 bytes |
22 files changed, 115 insertions, 74 deletions
@@ -1,2 +1,5 @@ Nicolas Hennion (aka) Nicolargo -http://www.nicolargo.com
\ No newline at end of file +http://www.nicolargo.com + +Alessio Sergi (aka) Al3hex +https://twitter.com/al3hex diff --git a/ChangeLog b/ChangeLog deleted file mode 100644 index 139597f9..00000000 --- a/ChangeLog +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/MANIFEST.in b/MANIFEST.in index 73946636..b9fac908 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -8,4 +8,4 @@ include screenshot.png recursive-include doc *.png recursive-include man *.1 recursive-include i18n *.mo -recursive-include glances *.html *.css *.png +recursive-include src *.html *.css *.png diff --git a/Makefile b/Makefile deleted file mode 100644 index 3de27b5d..00000000 --- a/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -MSGFMT = msgfmt -v - -.SUFFIXES: .po .mo - -MSGOBJ := $(patsubst %.po,%.mo,$(wildcard i18n/*/LC_MESSAGES/*.po)) - -.po.mo: - $(MSGFMT) -o $@ $< - -all: $(MSGOBJ) @@ -2,27 +2,24 @@ Version 1.4 =========== * Goodby StatGrab... Welcome to the PsUtil library ! - * CSV output - * No more autotools, use setup.py to install - * Sort by Process name ('p' key) + * No more autotools, use setup.py to install (or package) * Only major stats (CPU, Load and memory) use background colors - * Add optionnal (if space is available): PID, UID - * Improve operating system name - * Disable Disk IO module from the command line (-d) - * Disable Mount module from the command line (-m) - * Disable Net rate module from the command line (-n) - * Code is now checked with pep8 - - And thanks to Alessio Sergi: + * Improve operating system name detection * New system info: one-line layout and add Arch Linux support * No decimal places for values < GB * New memory and swap layout * Add percentage of usage for both memory and swap - * Add MEM% usage, NICE, STATUS and running TIME per process to the processes info - * Add sort by MEM% + * Add MEM% usage, NICE, STATUS, UID, PID and running TIME per process + * Add sort by MEM% ('m' key) + * Add sort by Process name ('p' key) + * Multiple minor fixes, changes and improvements + * Disable Disk IO module from the command line (-d) + * Disable Mount module from the command line (-m) + * Disable Net rate module from the command line (-n) * Improved FreeBSD support * Cleaning code and style - * Multiple minor fixes, changes and improvements> + * Code is now checked with pep8 + * CSV and HTML output (experimental functions, no yet documentation) Version 1.3.7 ============= @@ -45,6 +45,18 @@ Then install the latest Glances version: $ sudo pip install glances +### From PPA (Ubuntu/Mint) + +Thanks to Arnaud Hartmann, a PPA is available for the stable branch. + +To install it on your Ubuntu system: + + $ sudo add-apt-repository ppa:arnaud-hartmann/glances-stable + $ sudo apt-get update + $ sudo apt-get install glances + +The PPA is available for Ubuntu version 9.10 to 12.04. + ### From source Get the latest version: @@ -94,23 +106,23 @@ When Glances is running, you can press: * 'd' Disable or enable the disk IO stats * 'f' Disable or enable the file system stats * 'l' Disable or enable the logs -* 'm' to sort the processes list by process size +* 'm' to sort the processes list by process MEM * 'n' Disable or enable the network interfaces stats +* 'p' to sort by process name * 'q' Exit ### Header  -The header shows the Glances version, the host name and the operating -system name, version and architecture. +The header shows the host name and the operating system name, version and architecture. ### CPU  The CPU states are shown as a percentage and for the configured refresh -time. +time. The total CPU usage is displayed on the first line. If user|kernel|nice CPU is < 50%, then status is set to "OK". @@ -129,7 +141,8 @@ average sum of the number of processes waiting in the run-queue plus the number currently executing over 1, 5, and 15 minute time periods." Glances gets the number of CPU cores to adapt the alerts. With Glances, -alerts on average load are only set on 5 and 15 mins. +alerts on average load are only set on 5 and 15 mins. The first line +also display the number of CPU core. If average load is < O.7*Core, then status is set to "OK". @@ -143,7 +156,7 @@ If average load is > 5*Core, then status is set to "CRITICAL".  -Glances uses tree columns: memory (RAM), swap and "real". +Glances uses tree columns: memory (RAM), "real" and swap. Real used memory is: used - cache. @@ -217,6 +230,25 @@ sorted by CPU of memory consumption. The number of processes in the list is adapted to the screen size. +* VIRT: Virtual memory size (in byte) +* REST: Amount of resident memory (in byte) +* CPU%: % of CPU used by the process +* MEM%: % of MEM used by the process +* PID: Process ID +* USER: Process user ID +* NI: Nice level of the process +* S: Process status + + R - Running + D - Sleeping (may not be interrupted) + S - Sleeping (may be interrupted) + T - Traced or stopped + Z - Zombie or "hung" process + +* TIME+: Cumulative CPU time used +* NAME: Process name or command line + + ### Logs  @@ -237,7 +269,7 @@ There is one line per alert with the following information:  -Glances displays a caption and the current time/date. +Glances displays the current time/date and access to the embeded help screen. ## Localisation @@ -251,6 +283,6 @@ i18n_espanol_generate.sh You are welcome to contribute to this software. -* Packaging for Debian, Ubuntu, BSD... -* Check the needed Python library in the configure.ac -* Add file system stats when the python-statgrab is corrected +* Code optimization +* Port to FreeBSD and Mac OS X +* Documentation for HTML and CVS export option @@ -6,7 +6,7 @@ Glances -- Votre système en un coups d'oeil Glances est un logiciel libre (licence LGPL) permettant de surveiller votre système d'exploitation GNU/Linux ou BSD à partir d'une interface texte. -Glances utilise la librairie libstatgrab pour récupérer les informations de +Glances utilise la librairie PsUtil pour récupérer les informations de votre système. Il est développé en Python.  @@ -20,18 +20,17 @@ Le processus de packaging est actuellement en cours sur d'autres distribs, je vous conseille donc de rechercher Glances sur votre gestionnaire de package avant de faire une installation depuis les sources. -### Depuis le PPA (pour les systèmes Ubuntu/Mint...) +### Depuis le PPA (Ubuntu/Mint) -Arnaud Hartmann (thanks to him !) maintient un PPA avec la dernière version: +Arnaud Hartmann maintient un PPA avec la version stable de Glances. -Pour installer le PPA: +Pour installer Glances à partir de ce PPA, il suffit de saisir: - $ sudo add-apt-repository ppa:arnaud-hartmann/glances-dev - $ sudo apt-get update + $ sudo add-apt-repository ppa:arnaud-hartmann/glances-stable + $ sudo apt-get update + $ sudo apt-get install glances -Pour installer Glances à partir de ce PPA: - - $ sudo apt-get install glances +Le PPA propose les paquets pour les versions Ubuntu 9.10 jusqu'à 12.04. ### Depuis PyPi @@ -261,13 +260,3 @@ i18n_francais_generate.sh Pour générer et installer la traduction espagnol executer le script suivant sous l'utilisateur root ou sudo i18n_espanol_generate.sh - -## A faire... - -J'ai besoin de contributeurs pour faire évoluer Glances. - -Notamment: - -* Packaging pour Debian, Ubuntu, BSD et toutes autres distributions -* Controle de la présence des librairie dans le fichier configure.ac -* Optimisation du code @@ -45,6 +45,18 @@ Then install the latest Glances version: $ sudo pip install glances +### From PPA (Ubuntu/Mint) + +Thanks to Arnaud Hartmann, a PPA is available for the stable branch. + +To install it on your Ubuntu system: + + $ sudo add-apt-repository ppa:arnaud-hartmann/glances-stable + $ sudo apt-get update + $ sudo apt-get install glances + +The PPA is available for Ubuntu version 9.10 to 12.04. + ### From source Get the latest version: @@ -94,23 +106,23 @@ When Glances is running, you can press: * 'd' Disable or enable the disk IO stats * 'f' Disable or enable the file system stats * 'l' Disable or enable the logs -* 'm' to sort the processes list by process size +* 'm' to sort the processes list by process MEM * 'n' Disable or enable the network interfaces stats +* 'p' to sort by process name * 'q' Exit ### Header  -The header shows the Glances version, the host name and the operating -system name, version and architecture. +The header shows the host name and the operating system name, version and architecture. ### CPU  The CPU states are shown as a percentage and for the configured refresh -time. +time. The total CPU usage is displayed on the first line. If user|kernel|nice CPU is < 50%, then status is set to "OK". @@ -129,7 +141,8 @@ average sum of the number of processes waiting in the run-queue plus the number currently executing over 1, 5, and 15 minute time periods." Glances gets the number of CPU cores to adapt the alerts. With Glances, -alerts on average load are only set on 5 and 15 mins. +alerts on average load are only set on 5 and 15 mins. The first line +also display the number of CPU core. If average load is < O.7*Core, then status is set to "OK". @@ -143,7 +156,7 @@ If average load is > 5*Core, then status is set to "CRITICAL".  -Glances uses tree columns: memory (RAM), swap and "real". +Glances uses tree columns: memory (RAM), "real" and swap. Real used memory is: used - cache. @@ -217,6 +230,25 @@ sorted by CPU of memory consumption. The number of processes in the list is adapted to the screen size. +* VIRT: Virtual memory size (in byte) +* REST: Amount of resident memory (in byte) +* CPU%: % of CPU used by the process +* MEM%: % of MEM used by the process +* PID: Process ID +* USER: Process user ID +* NI: Nice level of the process +* S: Process status + + R - Running + D - Sleeping (may not be interrupted) + S - Sleeping (may be interrupted) + T - Traced or stopped + Z - Zombie or "hung" process + +* TIME+: Cumulative CPU time used +* NAME: Process name or command line + + ### Logs  @@ -237,7 +269,7 @@ There is one line per alert with the following information:  -Glances displays a caption and the current time/date. +Glances displays the current time/date and access to the embeded help screen. ## Localisation @@ -251,6 +283,6 @@ i18n_espanol_generate.sh You are welcome to contribute to this software. -* Packaging for Debian, Ubuntu, BSD... -* Check the needed Python library in the configure.ac -* Add file system stats when the python-statgrab is corrected +* Code optimization +* Port to FreeBSD and Mac OS X +* Documentation for HTML and CVS export option @@ -1 +1 @@ -- Packaging for Debian (contributors needed) +- Include in the Debian repos (contributors needed) diff --git a/doc/cpu.png b/doc/cpu.png Binary files differindex 870c3972..71ea2717 100644 --- a/doc/cpu.png +++ b/doc/cpu.png diff --git a/doc/footer.png b/doc/footer.png Binary files differindex 877ffcf4..1145927d 100644 --- a/doc/footer.png +++ b/doc/footer.png diff --git a/doc/header.png b/doc/header.png Binary files differindex f557e586..5b381833 100644 --- a/doc/header.png +++ b/doc/header.png diff --git a/doc/mem.png b/doc/mem.png Binary files differindex 931fb848..fa4be64c 100644 --- a/doc/mem.png +++ b/doc/mem.png diff --git a/doc/processlist.png b/doc/processlist.png Binary files differindex 236608fd..f76c1e32 100644 --- a/doc/processlist.png +++ b/doc/processlist.png diff --git a/screenshot.png b/screenshot.png Binary files differindex 97a7fee3..a8102410 100644 --- a/screenshot.png +++ b/screenshot.png @@ -15,16 +15,16 @@ data_files = [ 'NEWS', 'screenshot.png']), ('share/doc/glances/doc', glob('doc/*.png')), - ('share/glances/html', glob('glances/html/*.html')), - ('share/glances/html/css', glob('glances/css/*.css')), - ('share/glances/html/img', glob('glances/img/*.png')), + ('share/glances/html', glob('src/html/*.html')), + ('share/glances/html/css', glob('src/css/*.css')), + ('share/glances/html/img', glob('src/img/*.png')), ] for mo in glob('i18n/*/LC_MESSAGES/*.mo'): data_files.append((dirname(mo).replace('i18n/', 'share/locale/'), [mo])) setup(name='Glances', - version='1.4b', - download_url='https://github.com/downloads/nicolargo/glances/glances-1.4b.tar.gz', + version='1.4', + download_url='https://github.com/downloads/nicolargo/glances/glances-1.4.tar.gz', url='https://github.com/nicolargo/glances', description='CLI curses-based monitoring tool', author='Nicolas Hennion', diff --git a/glances/__init__.py b/src/__init__.py index e69de29b..e69de29b 100644 --- a/glances/__init__.py +++ b/src/__init__.py diff --git a/glances/css/default.css b/src/css/default.css index 7f4ac371..7f4ac371 100644 --- a/glances/css/default.css +++ b/src/css/default.css diff --git a/glances/glances.py b/src/glances.py index 4618b422..4d005c03 100755 --- a/glances/glances.py +++ b/src/glances.py @@ -22,7 +22,7 @@ from __future__ import generators __appname__ = 'glances' -__version__ = "1.4b20" +__version__ = "1.4" __author__ = "Nicolas Hennion <nicolas@nicolargo.com>" __licence__ = "LGPL" diff --git a/glances/html/base.html b/src/html/base.html index 56779ad8..56779ad8 100644 --- a/glances/html/base.html +++ b/src/html/base.html diff --git a/glances/html/default.html b/src/html/default.html index db894b15..db894b15 100644 --- a/glances/html/default.html +++ b/src/html/default.html diff --git a/glances/img/bg.png b/src/img/bg.png Binary files differindex 3b0bb7e3..3b0bb7e3 100644 --- a/glances/img/bg.png +++ b/src/img/bg.png |
