diff --git a/ChangeLog b/ChangeLog deleted file mode 100644 index bb9bdd50..00000000 --- a/ChangeLog +++ /dev/null @@ -1,1882 +0,0 @@ -Nicolas Hennion 2013-03-23 - - version 1.6.1 - -Merge: a0e1380 a0060f9 -Nicolas Hennion 2013-03-19 - - Merge pull request #218 from jrenner/master - - Tried to improve autoUnit - -Jon Renner 2013-03-19 - - work in improving autoUnit - -Merge: 3feb3b3 5540b0a -Nicolas Hennion 2013-03-19 - - Merge pull request #217 from jrenner/master - - Fixes #215 changed timer to only reset when an update is run, not just an attempt to update - -Jon Renner 2013-03-19 - - possible solution for issue #215 - -Nicolas Hennion 2013-03-18 - - Change refresh_time to cached_time for the server side - -Merge: a9a7a70 02bd6d2 -Nicolas Hennion 2013-03-18 - - Merge pull request #216 from jrenner/master - - implement time_since_update for disk and processes - -Jon Renner 2013-03-18 - - add time_since_update for disk and process_disk - - remove one line - -Nicolas Hennion 2013-03-17 - - Solve issue #206 / Server port in client mode - -Merge: db6bfc2 837446e -Nicolas Hennion 2013-03-15 - - Merge pull request #203 from jrenner/master - - add time_since_update to netstats (let API users calc net bytes/s) - -Jon Renner 2013-03-15 - - netstats dict now contains time_since_update - -Merge: 7aa29c5 62df236 -Nicolas Hennion 2013-03-10 - - Merge pull request #202 from jrenner/master - - fixed crash bug related to custom port with '-p' arg - -Jon Renner 2013-03-10 - - fix crash bug when specifying custom server port - -Merge: 345cd2d f0fe6af -Nicolas Hennion 2013-03-08 - - Merge pull request #199 from jrenner/master - - fix bits/bytes calculation - -Jon Renner 2013-03-07 - - fix num of bits calculation for network stats - -Nicolas Hennion 2013-03-06 - - Apply patch https://github.com/nicolargo/glances/pull/197#issuecomment-14490606 - -Merge: d94eceb 22fdb43 -Nicolas Hennion 2013-03-06 - - Merge branch 'master' of github.com:nicolargo/glances - -Merge: f7d96b5 508ad16 -Nicolas Hennion 2013-03-06 - - Merge pull request #197 from jrenner/master - - press 'u' to view cumulative network traffic - -Merge: f7d96b5 508ad16 -Nicolas Hennion 2013-03-06 - - Merge branch 'master' of https://github.com/jrenner/glances - -Jon Renner 2013-03-06 - - key "u" shows cumulative net traffic - -Merge: e867e75 94b10cc -Nicolas Hennion 2013-03-05 - - Merge pull request #196 from jrenner/master - - Sorry, I forgot to change the comment - -Jon Renner 2013-03-05 - - correct comment for keypress "t" (116) to match help screen text - -Merge: e5c7df9 3603ed9 -Nicolas Hennion 2013-03-05 - - Merge pull request #195 from jrenner/master - - Press 't' to toggle single Rx+Tx/s column under network stats - -Jon Renner 2013-03-05 - - decided on final column name: Rx+Tx/s - -Jon Renner 2013-03-05 - - needed a not in the boolean check for network_stats_totalled - -Jon Renner 2013-03-05 - - needed a not in the boolean check for network_stats_totalled - -Jon Renner 2013-03-05 - - implemented Total net traffic as single R+T/s column - -Jon Renner 2013-03-05 - - Implemented toggle for total net stats - -Jon Renner 2013-03-05 - - added Total traffic to network stats - -Merge: a1cad52 0560f63 -Nicolas Hennion 2013-02-22 - - Merge pull request #187 from asergi/master - - Improve packaging - -Alessio Sergi 2013-02-22 - - Improve packaging - -Merge: f42cea0 e5f9c92 -Nicolas Hennion 2013-02-22 - - Merge pull request #185 from asergi/master - - Fix Travis-CI issue - -Alessio Sergi 2013-02-21 - - Disable test against Travis-CI - -Alessio Sergi 2013-02-21 - - Disable test against Travis-CI - -Alessio Sergi 2013-02-21 - - Fix Travis-CI issue - -Merge: 1dfca91 8cecbe0 -Nicolas Hennion 2013-02-20 - - Merge pull request #184 from abeudin/master - - Add init script - -Adrien Beudin 2013-02-20 - - bug fix - -Adrien Beudin 2013-02-20 - - update init script - -Adrien Beudin 2013-02-20 - - add init script - -Nicolas Hennion 2013-02-19 - - Update the readme to remove Travis... - -Nicolas Hennion 2013-02-19 - - .travis.yml make me sad - -Nicolas Hennion 2013-02-19 - - Change the travis conf file to run the unitest.py script - -Nicolas Hennion 2013-02-19 - - Change the travis conf file to run the unitest.py script - -Nicolas Hennion 2013-02-19 - - Change the travis conf file to run the unitest.py script - -Nicolas Hennion 2013-02-19 - - Change the travis conf file to run the unitest.py script - -Nicolas Hennion 2013-02-18 - - Change documentation for Windows Installation - -Merge: b40f8ed 69479e6 -Nicolas Hennion 2013-02-17 - - Merge pull request #182 from asergi/master - - Improve help display - -asergi 2013-02-17 - - Improve help display - -asergi 2013-02-17 - - Update NEWS as per #179 - -asergi 2013-02-17 - - Update man page as per #181 - -Nicolas Hennion 2013-02-16 - - Update the NEWS with the latest pull #181 - -Merge: 666342c 8a58f71 -Nicolas Hennion 2013-02-16 - - Merge pull request #181 from creaktive/master - - Added command-line option to disable the curses.A_BOLD - -Stanislaw Pusep 2013-02-16 - - Added -z/--nobold option for better appearence under Solarized terminal color scheme - -Merge: 957d672 4830f41 -Nicolas Hennion 2013-02-15 - - Merge pull request #180 from asergi/master - - More dummy FS to ignore - -asergi 2013-02-15 - - Add more dummy FS to the ignore list - -Merge: cac7862 98074ed -Nicolas Hennion 2013-02-14 - - Merge pull request #179 from asergi/master - - Nice pull ! - - Thk Alessio - -Merge: de0e47d facd698 -Nicolas Hennion 2013-02-14 - - Merge pull request #178 from ZogStriP/patch-1 - - Added travis-ci build status image - -asergi 2013-02-14 - - Add per-user settings support - -Régis Hanol 2013-02-14 - - Added travis-ci build status image - -Merge: a3194f4 b2829dd -Nicolas Hennion 2013-02-07 - - Merge pull request #174 from jellonek/master - - Support processes with uids unknown to pwd lib. - -Piotr Skamruk 2013-02-07 - - Workaround for unknown users. - -Nicolas Hennion 2013-02-04 - - Repair unitest.py after commit https://github.com/asergi/glances/commit/d558e51e2a0f69928396a64c432eb6f255f15384 - -Nicolas Hennion 2013-01-31 - - On the road on the version 1.6.1 - -Nicolas Hennion 2013-01-31 - - Correct a bug on the critical limit for procecess / Take into acount the number of core in the process CPU limits - -Merge: fce5686 ad5c902 -Nicolas Hennion 2013-01-31 - - Merge pull request #171 from asergi/master - - Drop obsolete code / Huge patch ! Thk for your work Alessio !!! - -asergi 2013-01-31 - - More code cleanup - -asergi 2013-01-31 - - Drop obsolete code - -Nicolas Hennion 2013-01-26 - - Update AUTHORS - -Nicolas Hennion 2013-01-26 - - version 1.6 - -Nicolas Hennion 2013-01-22 - - Add password for the client/server mode - -Merge: 6d00de1 f7b96d3 -Nicolas Hennion 2013-01-21 - - Merge pull request #167 from asergi/master - - Fix for issues #157, #158 and #164 - -asergi 2013-01-20 - - Fixes and cleanup - -asergi 2013-01-20 - - OS X: corret an issue on memory display - -asergi 2013-01-20 - - OS X: ignore dummy process - -asergi 2013-01-20 - - Fix for issues #157, #158 and #164 - -Merge: 17cb69b 0a559e7 -Nicolas Hennion 2013-01-20 - - Merge pull request #166 from Verrus/master - - Fixxed my self found issue #165 - -Verrus 2013-01-19 - - deleted the README-FR as required file. - -Nicolas Hennion 2013-01-19 - - Change the default conf file (limits) - -Nicolas Hennion 2013-01-19 - - In client/server mode Glances grabs limits from the server side - -Nicolas Hennion 2013-01-18 - - Correct a bug with special key (issue #163) - -Nicolas Hennion 2013-01-18 - - Correct io_counters error client/server Issue #164 - -Nicolas Hennion 2013-01-16 - - Add the PsUtil version to the -v and -h tag - -Nicolas Hennion 2013-01-16 - - Catch curs_set - -Nicolas Hennion 2013-01-16 - - Add key control on Mac OS X - -Nicolas Hennion 2013-01-16 - - Add key control on Mac OS X - -Nicolas Hennion 2013-01-16 - - Include patch from Kelly Anderson: - - * The first patch was required to get glances working on python 3.3, I'm - not sure if it breaks python 2.7 implementations, but I figured it would - be good for you to take a look at it. - - * The NoSuchProcess patches should be considered one, since the second - patch fixed the problem correctly and depends on the first patch being - applied. - - * The NoSuchProcess exception is thrown from PsUtils when you try to - access a process that has "disappeared/finished". - - * The ConfigParser patch will take care of the fact that ConfigParser was - renamed configparser with Python3. - -Merge: bfbc1b7 28c893a -Nicolas Hennion 2013-01-12 - - Merge pull request #162 from asergi/master - - Change default config file path - -asergi 2013-01-12 - - Fix setup.py - -Merge: ebf8cf9 9359637 -Nicolas Hennion 2013-01-11 - - Merge pull request #160 from nicolargo/iorate - - IoRate and more... - -Nicolas Hennion 2013-01-11 - - New release for the french file translation - -Nicolas Hennion 2013-01-11 - - Add comments - -Nicolas Hennion 2013-01-11 - - Display IOWait on the PerCpu view - -Nicolas Hennion 2013-01-10 - - Correct an issue on perCPU display - -Nicolas Hennion 2013-01-10 - - Add fct to define color/alert - -Nicolas Hennion 2013-01-09 - - Add remarks on IOWait limits - -Nicolas Hennion 2013-01-09 - - Add IORate and first code for file configuration - -Merge: a81bf5c 8a643f1 -Nicolas Hennion 2012-12-30 - - Merge pull request #154 from peritus/patch-1 - - Fix typo: s/AccesDenied/AccessDenied/ - -Filip Noetzel 2012-12-30 - - Fix typo: s/AccesDenied/AccessDenied/ - - Helps with "AttributeError: 'module' object has no attribute 'AccesDenied'" - -Nicolas Hennion 2012-12-30 - - Change installation proc - -Nicolas Hennion 2012-12-29 - - Update doc - -Nicolas Hennion 2012-12-29 - - Update screenshot - -Nicolas Hennion 2012-12-29 - - Fixed UnboundLocalError / Thk to Geoff - -Nicolas Hennion 2012-12-28 - - version 1.5.2 - -Nicolas Hennion 2012-12-28 - - Double check if right is ok for process stats - -Nicolas Hennion 2012-12-26 - - Little hack for a PsUtil issue #152 - -Nicolas Hennion 2012-12-24 - - Test on DIskIO - -Nicolas Hennion 2012-12-21 - - Add color to sensors - -Nicolas Hennion 2012-12-21 - - Add a condition to test if limits exist before the process sort - -Nicolas Hennion 2012-12-21 - - Delete the unused getAll fonction from the GlancesStat class - -Nicolas Hennion 2012-12-20 - - Try to correct a bug on OpenVZ / See Issue #141 - -Nicolas Hennion 2012-12-20 - - Correct #Issue #149 - -Nicolas Hennion 2012-12-18 - - Replace cmdline per name when filter Idle process ! Fuck... Had to sleep... - -Nicolas Hennion 2012-12-18 - - Hide Idle processes on Windows too: Name System Idle Process - -Nicolas Hennion 2012-12-18 - - Add ascii encoding on network interface name - -Nicolas Hennion 2012-12-18 - - Add ascii encoding on network interface name - -Nicolas Hennion 2012-12-18 - - Filter and hide idle processes on Windows and FreeBSD - -Merge: e93d20c f474966 -Nicolas Hennion 2012-12-17 - - Merge pull request #148 from asergi/master - - Test: python3 compatibility fix - -Nicolas Hennion 2012-12-17 - - Add new RPC methods: 'getAll', 'getCore', 'getCpu', 'getDiskIO', 'getFs', 'getLoad', 'getMem', 'getMemSwap', 'getNetwork', 'getNow', 'getProcessCount', 'getProcessList', 'getSensors', 'getSystem' - -asergi 2012-12-15 - - Test: python3 fix - -Merge: 3674652 f522501 -asergi 2012-12-15 - - Merge remote-tracking branch 'upstream/master' - -Nicolas Hennion 2012-12-14 - - Space optim for processing (IO) - -Nicolas Hennion 2012-12-14 - - Update .gitignore - -Nicolas Hennion 2012-12-14 - - Solve issue on process display - -asergi 2012-12-14 - - Fix unicode formatting bug - -Nicolas Hennion 2012-12-14 - - Merge Pull #146 - -Merge: 8795724 cafa382 -Nicolas Hennion 2012-12-14 - - Merge branch 'master' of https://github.com/asergi/glances into asergi-master - - Conflicts: -glances/glances.py - -asergi 2012-12-14 - - Update README and man. Cleanup. - -asergi 2012-12-14 - - Sensors: lm_sensors is Linux-only - -asergi 2012-12-13 - - Fix unicode encoding issue - -asergi 2012-12-13 - - Sensors: display only temperature stats - -Nicolas Hennion 2012-12-13 - - replace hasattr by ... in ... - -asergi 2012-12-13 - - Complete fix issue #136 - -Nicolas Hennion 2012-12-13 - - Add control on receive stat. Correct Issue #145 - -Nicolas Hennion 2012-12-13 - - Correct the issue #136 - -Nicolas Hennion 2012-12-13 - - Try and catch to solve AccessDenied on username stat on Windows 7 - -Nicolas Hennion 2012-12-13 - - Try and catch to solve AccessDenied on nice stat on Windows 7 - -Nicolas Hennion 2012-12-13 - - Delete an unused function - -Nicolas Hennion 2012-12-12 - - Correct a bug on unitary tests - -Nicolas Hennion 2012-12-12 - - Update AUTHORS file - -Merge: c60736e 4d92032 -Nicolas Hennion 2012-12-10 - - Merge pull request #140 from nicolargo/newprocessesclass - - Newprocessesclass - -Nicolas Hennion 2012-12-10 - - Remove sandbox - -Nicolas Hennion 2012-12-10 - - Correct a bug when x size < caption len - -Nicolas Hennion 2012-12-10 - - New pocesses class for server - -Nicolas Hennion 2012-12-09 - - Add a new class to manage process list - -Nicolas Hennion 2012-12-08 - - Loged stats are displayed using reverse color / Other important stat with color - -Nicolas Hennion 2012-12-07 - - Reverse pull 139 - -Merge: 6f62773 4964abe -Nicolas Hennion 2012-12-07 - - Merge pull request #139 from philips/fix-crasher-in-memory-stats - - glances: fix crasher - -Brandon Philips 2012-12-06 - - glances: fix crasher - - you need to call the function otherwise you will try running float() on - a function later when you try displaying it - - Introduced in eda1cf5ba750ed82700b018b799db2ca31693870 - -Nicolas Hennion 2012-12-06 - - Reverte issue #138 - -Nicolas Hennion 2012-12-05 - - Correct an issue on the default.html Jinja template - -Nicolas Hennion 2012-12-05 - - Refactor CPU and LOAD stats graber - -Nicolas Hennion 2012-12-05 - - Cosmetic change - -Nicolas Hennion 2012-12-05 - - Solve an issue when screen size < 80 columns - -Nicolas Hennion 2012-12-05 - - Solve an issue when screen size < 80 columns - -Merge: 27b5653 4b984ba -Nicolas Hennion 2012-12-04 - - Merge pull request #137 from asergi/master - - Fix memory active/inactive bug on Windows - -asergi 2012-12-04 - - Mem: fix active/inactive bug on Windows - -Merge: 422f628 b8baced -Nicolas Hennion 2012-12-03 - - Merge pull request #135 from asergi/master - - Fixes and improvements - -asergi 2012-12-03 - - Some small fixes and cleanup - -asergi 2012-12-03 - - Fix alignment of numbers and strings - -asergi 2012-12-02 - - Improve top layout. Mem: add new stats. - -Merge: d04b030 007b3a3 -Nicolas Hennion 2012-11-29 - - Merge pull request #131 from philips/refactor-classes - - Refactor classes - -Brandon Philips 2012-11-29 - - glances: refactor glancesStats into three classes - - refactor glancesStats into three classes. This way glances can support a - new backend like the Cloud Monitoring Agent in a more clean manner. - -Brandon Philips 2012-11-28 - - glances: cleanup end of line whitespace - - there were a lot of lines with end of line whitespace. Clean it all up. - -Nicolas Hennion 2012-11-24 - - Change CPU Display - -Nicolas Hennion 2012-11-24 - - Color on extended CPU info - -Nicolas Hennion 2012-11-24 - - Correct bug with server in version 1.5.1 - -Nicolas Hennion 2012-11-21 - - Improve CPU stats displaying - -Merge: f487b99 5fa1f96 -Nicolas Hennion 2012-11-18 - - Merge pull request #126 from nicolargo/sensors - - Sensors module - -Nicolas Hennion 2012-11-18 - - Commit for the sensors module - -Nicolas Hennion 2012-11-17 - - First version with sensors. Not running with client/server - -Nicolas Hennion 2012-11-16 - - Replace the PsUtil version checker / Should correct an issue on VM client - -Nicolas Hennion 2012-11-13 - - Correct French traduction - -Merge: 24761a6 7968182 -Nicolas Hennion 2012-11-11 - - Merge pull request #123 from asergi/master - - Add systemd support - -asergi 2012-11-11 - - Add systemd support - -Merge: 7436794 94d016a -Nicolas Hennion 2012-11-10 - - Merge pull request #122 from david-guenault/master - - Fix html template path in glancesHtml class - -David GUENAULT 2012-11-10 - - Fix html template path in glancesHtml Class - -Nicolas Hennion 2012-11-09 - - Patch for HTML and CSV output - -Merge: 51e2b7e c101c7a -Nicolas Hennion 2012-11-09 - - Merge pull request #119 from asergi/master - - Fix python3 support - -asergi 2012-11-09 - - Fix python3 support - -Nicolas Hennion 2012-11-09 - - version 1.5.1 - -Merge: b9c6615 aa5d77b -Nicolas Hennion 2012-11-09 - - Merge pull request #118 from asergi/master - - Fix bugs for psutil < 0.6.0 - -asergi 2012-11-09 - - Fix bugs for psutil < 0.6.0 - -Nicolas Hennion 2012-11-08 - - Load international before first message... - -Nicolas Hennion 2012-11-07 - - Add screenshots - -Nicolas Hennion 2012-11-07 - - version 1.5 - -Nicolas Hennion 2012-11-07 - - Check PsUtil > 0.4.0 - -Nicolas Hennion 2012-11-07 - - Corect a bug on Windows and IO - -Nicolas Hennion 2012-11-07 - - Catch timedelta issue on Amazon EC2 server / related to issue #87 - -Nicolas Hennion 2012-11-07 - - Manage Fs name > 8 chars - -Nicolas Hennion 2012-11-07 - - Invert get_nice and nice - -Nicolas Hennion 2012-11-07 - - Re-add the main() function - -Nicolas Hennion 2012-11-06 - - Add Python 3 compatibility - -Nicolas Hennion 2012-11-06 - - Add refesh time for server side - -Nicolas Hennion 2012-11-06 - - Add a connected to / disconnected from server message - -Nicolas Hennion 2012-11-03 - - Update man page - -Nicolas Hennion 2012-11-02 - - Add control when server is down - -Nicolas Hennion 2012-11-02 - - Update documentation for the beta phase - -Nicolas Hennion 2012-11-02 - - Add shortkey to delete warning (w) or warning+critical (x) logs messages - -Merge: 921b8c5 a7e9ffe -Nicolas Hennion 2012-11-02 - - Merge pull request #108 from nicolargo/clientserver - - Clientserver - -Nicolas Hennion 2012-11-02 - - Change the process IO columns and update informations files - -Nicolas Hennion 2012-11-01 - - Add funcs to RPC instance - -Nicolas Hennion 2012-11-01 - - Glances client/server is now fully RPC/XML compliant - -Nicolas Hennion 2012-11-01 - - Correct a major issue on the get_io_counters on non user process (thx to the Alessio mail) - -Nicolas Hennion 2012-10-31 - - Corect bug on CPU % on Windows - -Nicolas Hennion 2012-10-31 - - CPU stats corrected for Windows - -Nicolas Hennion 2012-10-31 - - Force server mode for Windows OS - -Nicolas Hennion 2012-10-30 - - Add the -B argument for binding on a specific interface / optimize lib load - -Nicolas Hennion 2012-10-29 - - Add INIT and QUIT. Clean the code. Do stuff... - -Nicolas Hennion 2012-10-28 - - IO bug with client - -Nicolas Hennion 2012-10-28 - - Add first step of the Glances client/master - -Merge: 8ba41b7 769a0c4 -Nicolas Hennion 2012-10-24 - - Merge pull request #104 from 2xyo/master - - Add support of Travis CI continuous integration service - -Yohann Lepage 2012-10-24 - - Add support of Travis CI continuous integration service - -Nicolas Hennion 2012-10-23 - - Correct PATH in the Web export module - -Nicolas Hennion 2012-10-23 - - Minor doc update - -Merge: 2167d6c c9af089 -Nicolas Hennion 2012-10-23 - - Merge pull request #103 from sebastianmoreno/patch-1 - - Update i18n/es/LC_MESSAGES/glances.po - -Sebastián Moreno 2012-10-22 - - Update i18n/es/LC_MESSAGES/glances.po - - Algunas correcciones.  - -Merge: 0b04964 96d4f93 -Nicolas Hennion 2012-10-22 - - Merge branch 'master' of github.com:nicolargo/glances - -Nicolas Hennion 2012-10-22 - - Add -b (key 'b') to switch between bit/s or byte/s for network IO - -Merge: aec30cb f693e43 -Nicolas Hennion 2012-10-22 - - Merge pull request #101 from 2xyo/master - - Changelog is missing - - Add it to my own "build script" - -Yohann Lepage 2012-10-19 - - Add Changelog - -Merge: 2089543 415c830 -Nicolas Hennion 2012-10-16 - - Merge pull request #100 from mxjeff/locale-issue - - Fixed Portuguese locale name. - -kaliko 2012-10-15 - - Fixed Portuguese locale name - - On POSIX system locale follow "language[_territory]" naming scheme. - -Merge: 4542db5 c7b8651 -Nicolas Hennion 2012-10-08 - - Merge pull request #98 from mxjeff/html_issue - - Fixed broken HTML output (issue #97) - - Action (for me): make a formal validation of the HTML and CSV module - -kaliko 2012-10-08 - - Fixed broken HTML output (issue #97) - -Nicolas Hennion 2012-10-02 - - version 1.4.2.1 - -Nicolas Hennion 2012-09-25 - - Test as_dict()... - -Nicolas Hennion 2012-09-22 - - version 1.4.2 - -Nicolas Hennion 2012-09-22 - - Clean the code... - -Nicolas Hennion 2012-09-21 - - Clean the code, go back try / except - -Nicolas Hennion 2012-09-21 - - New function: Get process stats - -Nicolas Hennion 2012-09-21 - - New function: Get process stats - -Nicolas Hennion 2012-09-20 - - Cache OS information - -Merge: d445e79 4d2d357 -Nicolas Hennion 2012-09-19 - - Merge pull request #91 from rberaldo/master - - Brazilian Portuguese Translation - -Rafael Beraldo 2012-09-20 - - Files for the Brazilian Portuguese translation - -Nicolas Hennion 2012-09-19 - - Add Top process in the log - -Nicolas Hennion 2012-09-17 - - test code for IO ps - -Nicolas Hennion 2012-09-15 - - Use the news virtual_memory() and virtual_swap() fct - -Merge: f52bdf6 11c5eb7 -Nicolas Hennion 2012-09-15 - - Merge pull request #88 from dmd/patch-1 - - eliminate redundant 'per' - -Daniel M. Drucker 2012-09-14 - - eliminate redundant 'per' - - If you're measuring the rate of X, you can say Xps or X/s, but saying X/ps is redundant and wrong. - -Nicolas Hennion 2012-09-14 - - Update installation doc - -Nicolas Hennion 2012-09-12 - - pip install Glances / Better than pip install glances - -Nicolas Hennion 2012-09-10 - - After the 2to3 / Python 3 compatibility - -Merge: 2781b83 fd0b5f2 -Nicolas Hennion 2012-09-10 - - Merge branch 'master' of github.com:nicolargo/glances - -Nicolas Hennion 2012-09-10 - - After the 2to3 / Python 3 compatibility - -Nicolas Hennion 2012-09-09 - - Update README.md - -Merge: ac03b29 25cff95 -Nicolas Hennion 2012-09-09 - - Merge pull request #85 from luxflux/patch-1 - - Fix typo - -Raffael Schmid 2012-09-09 - - Fix typo - -Nicolas Hennion 2012-09-07 - - Add logo to HitHub doc 2 - -Nicolas Hennion 2012-09-07 - - Add logo to HitHub doc - -Merge: 6265763 f053798 -Nicolas Hennion 2012-09-07 - - Merge pull request #81 from dlion/master - - Italian translation added ! - Very nice works :) - - Thank ou for the contribution ! - -dlion 2012-09-07 - - Compiled file for italian translation - -dlion 2012-09-07 - - File for italian translation - -dlion 2012-09-07 - - Compiled file for italian translation - -dlion 2012-09-07 - - Italian translation file compiled - -dlion 2012-09-07 - - File for Italian Translation - -Nicolas Hennion 2012-09-06 - - version 1.4.1.1 - -Nicolas Hennion 2012-09-06 - - version 1.4.1 - -Merge: b128e05 60f2d6c -Nicolas Hennion 2012-09-06 - - Merge pull request #75 from dlion/master - - Uninstall script - -dlion 2012-09-06 - - A simple uninstall script - -Nicolas Hennion 2012-09-05 - - Add a switch -b to display network rate in byte per second - -Nicolas Hennion 2012-09-05 - - Add Process IO Read/Write information, if space is available - -Nicolas Hennion 2012-09-05 - - Add Process IO Read/Write information, if space is available - -Merge: 29e284b be3a0a3 -Nicolas Hennion 2012-09-05 - - Merge pull request #71 from xiongchiamiov/master - - Fix typos/misspellings in README - -Merge: 2f118aa 9dd6aa7 -Nicolas Hennion 2012-09-05 - - Merge pull request #70 from pigmonkey/master - - Fix README typo - -xiongchiamiov 2012-09-04 - - Fix typos/misspellings in README - - I didn't include the change made in pull #70: - https://github.com/nicolargo/glances/pull/70/files - - I also didn't make any changes to the French version, assuming that it is - already correct. - -Pig Monkey 2012-09-04 - - Fix README typo - -Merge: 9658dd3 47a8ba0 -Nicolas Hennion 2012-09-04 - - Merge pull request #66 from xorpaul/patch-1 - - fixed small spelling mistakes - -Andreas Paul 2012-09-04 - - fixed small spelling mistakes - -Andreas Paul 2012-09-04 - - fixed small spelling mistakes - -Nicolas Hennion 2012-09-04 - - Update installation documentation for OS X - -Nicolas Hennion 2012-09-04 - - Add first code for process IO / no display - -Merge: d2031d2 365a078 -Nicolas Hennion 2012-09-03 - - Merge pull request #60 from qzio/patch-1 - - link to correct flattr "thing" - -Merge: 62c1b34 5a90911 -Nicolas Hennion 2012-09-03 - - Merge pull request #58 from crcastle/patch-1 - - Add OSX install instructions - -joel hansson 2012-09-03 - - link to correct flattr "thing" - -Chris Castle 2012-09-03 - - Add OSX install instructions - - - Uses Homebrew package manager (and pip) - -Nicolas Hennion 2012-07-28 - - Add the '1' key to switch between per CPU / per core stats - -Nicolas Hennion 2012-07-26 - - Minor indentation change - -Nicolas Hennion 2012-07-26 - - Add unitest script - -Nicolas Hennion 2012-07-26 - - Update doc - -Nicolas Hennion 2012-07-26 - - Add per CPU information - -Nicolas Hennion 2012-07-11 - - Change installation procedure - -Nicolas Hennion 2012-07-11 - - Change installation procedure - -Nicolas Hennion 2012-07-09 - - Add depdencies in the documentation - -Nicolas Hennion 2012-07-09 - - Change installation procedure - -Nicolas Hennion 2012-07-07 - - Solve the issue #52 with Python 2.x - -Nicolas Hennion 2012-07-07 - - Solve the issue #52 with Python 2.x - -Nicolas Hennion 2012-07-07 - - Fix Setup.py issue - -Merge: 919b473 f620472 -Nicolas Hennion 2012-07-07 - - Merge pull request #51 from asergi/master - - Fix package build problem - -asergi 2012-07-07 - - Fix setup.py - -asergi 2012-07-07 - - Add glances dir - -asergi 2012-07-07 - - Rename src => glances - -Nicolas Hennion 2012-07-06 - - Change the setup.py - -Merge: 1e04f70 cfcf6bf -Nicolas Hennion 2012-07-06 - - version 1.4 - -Nicolas Hennion 2012-06-28 - - Change process nice for PsUtil 0.5.0 - -Nicolas Hennion 2012-06-21 - - A bunch of new features (#48) by Alessio Sergi - -asergi 2012-06-21 - - Add sort processes by MEM% (replace sort by VIRT) + other minor changes - -asergi 2012-06-20 - - Fix bare except: statements - -asergi 2012-06-19 - - Strip leading/trailing whitespaces from all files - -asergi 2012-06-19 - - Delete old backup files - -asergi 2012-06-19 - - Code style cleaning - -asergi 2012-06-16 - - Update help screen - -asergi 2012-06-16 - - Fix display of minutes in TIME+ - -asergi 2012-06-12 - - Add MEM%, NICE, STATUS and TIME+ to the processes infos - -asergi 2012-05-31 - - Put process summary on one line - -asergi 2012-05-31 - - Load: fix viewing on FreeBSD/Mac OS X - -asergi 2012-05-30 - - Mem/Swap: new layout and add percentage of usage - -asergi 2012-05-30 - - Fix formatting of log messages - -asergi 2012-05-27 - - No decimal places for values < GB - -asergi 2012-05-23 - - Improve system info. Add Arch Linux support. Fix FreeBSD system info. - -nicolargo 2012-05-02 - - Allow user to disable module from the command line - -nicolargo 2012-05-01 - - Add PID/UID to the processes informations - -nicolargo 2012-04-22 - - Add mem to CSV output and manage flush - -Merge: 20ebc26 671d647 -Nicolas Hennion 2012-04-05 - - Merge pull request #46 from asergi/experimental - - Thanks for your contrib ! - -asergi 2012-04-05 - - Fixed (another) broken multiline strings - -asergi 2012-04-05 - - Minor aesthetic fixes - -asergi 2012-04-05 - - Fixed broken multiline strings - -asergi 2012-04-04 - - Fix naming conventions issue - -asergi 2012-04-04 - - Fixed typos - -asergi 2012-04-04 - - Improved .gitignore - -nicolargo 2012-04-03 - - README - -nicolargo 2012-04-03 - - PEP8 - -nicolargo 2012-03-30 - - Bug correct on screen - -nicolargo 2012-03-30 - - Code checked with PEP8 checker - -nicolargo 2012-03-27 - - Patch on the Makefile.am (Thx to Al3Hex) - -nicolargo 2012-03-27 - - CVS - -nicolargo 2012-03-21 - - Add FS color in HTML output - -nicolargo 2012-03-21 - - Add test to solve issue #45 - -nicolargo 2012-03-17 - - Minor change - -nicolargo 2012-03-16 - - Correct for issue #37 - -nicolargo 2012-03-14 - - Add CLI option to manage HTML output - -nicolargo 2012-03-14 - - Add the MANIFEST.in - -Merge: 67fdbe9 e01737d -Nicolas Hennion 2012-03-14 - - Merge pull request #43 from laurentb/experimental - - Include package data files - -Laurent Bachelier 2012-03-14 - - Include package data files - -nicolargo 2012-03-14 - - Add additionnal file for HTML output - -nicolargo 2012-03-14 - - Update documentation: use setup.py for installation - -Merge: 86d8e0b 8721b82 -nicolargo 2012-03-14 - - Merge branch 'experimental' of github.com:nicolargo/glances into experimental - -Merge: edee020 91adde8 -Nicolas Hennion 2012-03-14 - - Merge pull request #42 from laurentb/experimental - - Much simpler, pure-python packaging + i18n - -Laurent Bachelier 2012-03-14 - - Simple building and packaging of i18n - -Laurent Bachelier 2012-03-13 - - Much simpler, pure-python packaging - -nicolargo 2012-03-13 - - Update doc for PPA - -nicolargo 2012-03-13 - - HTML Output - -nicolargo 2012-02-21 - - Ok when insert/remove external disk - -nicolargo 2012-02-21 - - Excexclude rootfs and autofs - -nicolargo 2012-02-18 - - Try before removing process - -nicolargo 2012-02-16 - - Reduce process load - -nicolargo 2012-02-14 - - Add control/msg to lib import - -nicolargo 2012-02-14 - - Solve the _() error message - -nicolargo 2012-02-13 - - Verbose the help message depending of the PsUtil version - -nicolargo 2012-02-13 - - Change the process list algorithm - -nicolargo 2012-02-12 - - Remove the unused get_io_counters calls - -nicolargo 2012-02-12 - - Ready for beta test - -nicolargo 2012-02-11 - - Change the help windows - -nicolargo 2012-02-08 - - PsUtil - Add process stat - -nicolargo 2012-02-07 - - Replace FsGrab by PsUtil - -nicolargo 2012-02-06 - - DISK IO - -nicolargo 2012-02-06 - - First version of the experimental BRANCH - PSUtil replace StatGrab for CPU, LOAD and MEM - -nicolargo 2012-01-31 - - version 1.3.7 - -nicolargo 2012-01-23 - - B&W console - -nicolargo 2012-01-22 - - Try for all the init color sequence - -nicolargo 2012-01-20 - - Flatt button in the README - -nicolargo 2012-01-19 - - Add try before curses.curs_set(0) - -nicolargo 2012-01-18 - - Update screenshot - -nicolargo 2012-01-18 - - version 1.3.6 - -nicolargo 2012-01-15 - - Change Roadmap to add the issue 26 - -Merge: 4a4e711 8ed8f53 -nicolargo 2012-01-13 - - wMerge branch 'master' of github.com:nicolargo/glances - - Conflicts: -src/glances.py - -nicolargo 2012-01-13 - - Minor update - -Merge: a29d712 0bb6563 -Nicolas Hennion 2012-01-13 - - Merge pull request #25 from jeanbob/master - - Traduction française (vérifié) et espagnole (non vérifié) - -Peter Fontaine (aka JeanBoB 2012-01-12 - - French and Spanish translation added. - -Peter Fontaine (aka JeanBoB 2012-01-06 - - i18n support added by JeanBoB. - French translation added. - -nicolargo 2012-01-05 - - Change the path to Python to env issue #20 - -nicolargo 2012-01-04 - - Upgrade ss - -nicolargo 2012-01-04 - - Update README - -nicolargo 2012-01-04 - - Update screenshot - -nicolargo 2012-01-04 - - version 1.3.5 - -nicolargo 2012-01-03 - - Add a buildout.cfg - -nicolargo 2011-12-25 - - Update screenshot - -nicolargo 2011-12-25 - - version 1.3.4 - -nicolargo 2011-12-23 - - Update screenshot for v1.3.3 - -nicolargo 2011-12-23 - - version 1.3.3 - -nicolargo 2011-12-21 - - Add Python PYPI informations - -nicolargo 2011-12-20 - - Add a french version of the README - -nicolargo 2011-12-18 - - Update the documentation - -nicolargo 2011-12-17 - - Update screenshot - -nicolargo 2011-12-17 - - version 1.3.2 - -nicolargo 2011-12-16 - - version 1.3.1 - -Merge: b6ac77b 46af718 -Nicolas Hennion 2011-12-15 - - Merge pull request #8 from rwmacleod/master - - Thx ! - -Randy MacLeod 2011-12-14 - - Fix consomption typo - -nicolargo 2011-12-14 - - No more FS limitation - -nicolargo 2011-12-13 - - Update screenshot - -nicolargo 2011-12-13 - - version 1.3 - -nicolargo 2011-12-10 - - Docs - -nicolargo 2011-12-10 - - Change the REAME for the 1.2 version - -nicolargo 2011-12-10 - - version 1.2 - -nicolargo 2011-12-06 - - Instructions to install on Ubuntu 10.04 and 10.10 - -nicolargo 2011-12-06 - - Ubuntu 10.04 note - -nicolargo 2011-12-06 - - Ubuntu < 11.04 notes - -nicolargo 2011-12-06 - - Change installation procedure - -nicolargo 2011-12-06 - - version 1.1.3 - -nicolargo 2011-12-05 - - v1.1.2 - -nicolargo 2011-12-05 - - version 1.1.1 - -nicolargo 2011-12-05 - - 1.1 screenshot - -nicolargo 2011-12-05 - - Add caption - -nicolargo 2011-12-05 - - Add setup.py - -nicolargo 2011-12-04 - - Catch CTRL-C before init screen - -nicolargo 2011-12-04 - - Catch CTRL-C before init screen - -nicolargo 2011-12-04 - - Add control before division - -nicolargo 2011-12-04 - - Fix Readme.md - -nicolargo 2011-12-04 - - Fix Readme.md - -nicolargo 2011-12-04 - - Fix screenshot in Readme.md - -nicolargo 2011-12-04 - - Add screenshot - -nicolargo 2011-12-04 - - First public release diff --git a/MANIFEST.in b/MANIFEST.in index 339ef4b4..1870a629 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,7 +1,6 @@ include AUTHORS include COPYING include NEWS -include README -recursive-include doc *.png +include README.rst +recursive-include docs images/*.png man/glances.1 glances-doc.html recursive-include i18n *.mo -recursive-include man *.1 diff --git a/README b/README deleted file mode 100644 index 151274ff..00000000 --- a/README +++ /dev/null @@ -1,448 +0,0 @@ -[![Flattr this git repo](http://api.flattr.com/button/flattr-badge-large.png)](https://flattr.com/thing/484466/nicolargoglances-on-GitHub) -[![Build Status](https://travis-ci.org/nicolargo/glances.png?branch=master)](https://travis-ci.org/nicolargo/glances) - -============================= -Glances -- Eye on your system -============================= - -![screenshot](https://github.com/nicolargo/glances/raw/master/doc/glances-white-256.png) - -## Description - -Glances is a CLI curses based monitoring tool for GNU/Linux and BSD OS. - -Glances uses the PsUtil library to get information from your system. - -It is developed in Python. - -Console (80x24) screenshot: - -![screenshot](https://raw.github.com/nicolargo/glances/master/doc/screenshot.png) - -Wide terminal (> 90x24) screenshot: - -![screenshot](https://raw.github.com/nicolargo/glances/master/doc/screenshot-wide.png) - -## Installation - -Pre-requisites (information for packagers): - -* Python 2.6+ (not tested with Python 3+) -* build-essential (for installation via Pypi and setup.py) -* python-dev (for installation via Pypi) -* python-setuptools (for the installation via setup.py) -* python-psutil 0.4.1+ (replace the old libstatgrab's lib) -* python-jinja2 2.0+ (optional for HTML export) -* pysensors (Python library for sensors stats) - -### From package manager (very easy way) - -Packages exist for Debian (SID), Arch, Fedora, Redhat, FreeBSD... - -Check if the version is the latest one. - -### From PyPi (easy and cross platform way) - -PyPi is an official Python package manager. - -You first need to install PyPi on your system. For example on Debian/Ubuntu: - - $ sudo apt-get update - $ sudo apt-get install python-pip build-essential python-dev - -Then install the latest Glances version: - - $ sudo pip install Glances - -Note: if you are behind an HTTP Proxy, you should use instead: - - $ sudo pip install --proxy=user:password@url:port Glances - -### From [Homebrew](http://mxcl.github.com/homebrew/) for Mac OS X - - $ brew install brew-pip - $ export PYTHONPATH=$(brew --prefix)/lib/python2.7/site-packages - $ brew pip Glances - -If you have the following error: - - Error: Failed executing: pip install glances==1.X --install-option=--prefix=/usr/local/XXX/glances/1.X (.rb:) - -then try to run: - - $ pip install glances==1.X --install-option=--prefix=/usr/local/XXX/glances/1.X - $ brew link Glances - -### Concerning Windows operating system - -Thanks to Nicolas Bourges, a Windows installer is available: - -64 bits: https://s3.amazonaws.com/glances/glances-1.6.0-x64.exe -32 bits: https://s3.amazonaws.com/glances/glances-1.6.0-x86.exe - -If you want to install it manually, please read the following procedure. - -Windows operating system only support the Glances in server mode. So if you ran Glances on Windows, it will be automaticaly running in server mode. - -To install Glances on you system: - - * Install [Python for Windows](http://www.python.org/getit/) - * Install the [PsUtil lib](https://code.google.com/p/psutil/downloads/list) - * Download the latest [Glances version](https://raw.github.com/nicolargo/glances/master/glances/glances.py) - -I am looking for a contributor to package Glances for Windows (for exemple using [PyInstaller](http://www.pyinstaller.org/)). - -### From source - -Get the latest version (form GitHub): - - $ rm -rf /tmp/nicolargo-glances-* - $ wget -O /tmp/glances-last.tgz https://github.com/nicolargo/glances/tarball/master - -Glances use a standard GNU style installer (for a Debian like system): - - $ sudo apt-get update - $ sudo apt-get install python-setuptools build-essential python-dev - $ cd /tmp - $ tar zxvf glances-last.tgz - $ cd nicolargo-glances-* - $ sudo python setup.py install - -## From a configuration manager - -Puppet: https://github.com/rverchere/puppet-glances - -Chef: https://github.com/cookbooks/hw-chef-glances - -## Configuration - -No configuration is needed to use Glances. - -Furthermore, the release 1.6 introduces a configuration file to setup limits. - -The default configuration file is under: - - /etc/glances/glances.conf (Linux) -or - - /usr/local/etc/glances/glances.conf (*BSD and OS X) - -To override the default configuration, you can copy the `glances.conf` file to -your `$XDG_CONFIG_HOME` directory (e.g. Linux): - - mkdir -p $XDG_CONFIG_HOME/glances - cp /etc/glances/glances.conf $XDG_CONFIG_HOME/glances/ - -On OS X, you should copy the configuration file to `~/Library/Application Support/glances/`. - -## Running - -### In standalone mode - -If you want to monitor your local machine, just run: - - $ glances - -### In client/server mode - -If you want to remotely monitor a machine (called server) from another one (called client). - -Run this command on the server: - - server$ glances -s - -and this one on the client: - - client$ glances -c @server - -where @server is the IP address or hostname of the server - -Glances uses a [XML/RPC](http://docs.python.org/2/library/simplexmlrpcserver.html) server and can be used by another client software. - -In server mode, you can set the bind address (-B ADDRESS) and listenning TCP port (-p PORT). - -In client mode, you can set the TCP port of the server (-p port). - -Default binding address is 0.0.0.0 (Glances will listen on all the networks interfaces) and TCP port is 61209. - -In client/server mode, limits are set by the server side. - -The version 1.6 introduces a optionnal password to access to the server (-P password). - -## User guide - -Command line options are: - - -b Display network rate in Byte per second - -B @IP|host Bind server to the given IP or host NAME - -c @IP|host Connect to a Glances server - -C file Path to the configuration file - -d Disable disk I/O module - -e Enable the sensors module (Linux-only) - -f file Set the output folder (HTML) or file (CSV) - -h Display the syntax and exit - -m Disable mount module - -n Disable network module - -o output Define additional output (available: HTML or CSV) - -p PORT Define the client or server TCP port (default: 61209) - -P password Client/server password - -r Do not list processes (significant CPU use reduction) - -s Run Glances in server mode - -t sec Set the refresh time in seconds (default: 3) - -v Display the version and exit - -y Enable the hddtemp module - -z Do not use the bold color attribute - -Importants stats are colored: - -* GREEN: stat counter is "OK" -* BLUE: stat counter is "CAREFUL" -* MAGENTA: stat counter is "WARNING" -* RED: stat counter is "CRITICAL" - -When Glances is running, you can press: - -* 'a' to set the automatic mode. The processes are sorted automatically - - IF CPU IoWait > 60% sort by process "IO read and write" - - If CPU > 70%, sort by process "CPU consumption" - - If MEM > 70%, sort by process "memory size" - -* 'b' switch between bit/s or byte/s for network IO -* 'c' sort the processes list by CPU consumption -* 'd' disable or enable the disk IO stats -* 'e' enable the sensors module (PySensors library is needed; Linux-only) -* 'f' disable or enable the file system stats -* 'h' to display a help message with the keys you can press and the limits -* 'i' sort the processes list by IO rate (need root account on some OS) -* 'l' disable or enable the logs -* 'm' sort the processes list by process MEM -* 'n' disable or enable the network interfaces stats -* 'p' sort by process name -* 's' disable or enable the sensor stats (only available with -e tag) -* 't' View network IO as combination -* 'u' View cumulative network IO -* 'w' delete finished warning logs messages -* 'x' delete finished warning and critical logs messages -* '1' switch between global CPU and per core stats -* 'q' Exit - -### Header - -![screenshot](https://github.com/nicolargo/glances/raw/master/doc/header.png) - -The header shows the host name and the operating system name, version and architecture. - -### CPU - -Short view: - -![screenshot](https://github.com/nicolargo/glances/raw/master/doc/cpu.png) - -If horizontal space is available, extended CPU infomations are displayed. - -Extended view (only available if your terminal is wide enough) - -![screenshot](https://github.com/nicolargo/glances/raw/master/doc/cpu-wide.png) - -If user click on the '1' key, per CPU stats is displayed: - -![screenshot](https://github.com/nicolargo/glances/raw/master/doc/percpu.png) - -The CPU stats are shown as a percentage and for the configured refresh -time. The total CPU usage is displayed on the first line. - -Color code used: - -If user|kernel|nice CPU is < 50%, then status is set to "OK". - -If user|kernel|nice CPU is > 50%, then status is set to "CAREFUL". - -If user|kernel|nice CPU is > 70%, then status is set to "WARNING". - -If user|kernel|nice CPU is > 90%, then status is set to "CRITICAL". - -### Load - -![screenshot](https://github.com/nicolargo/glances/raw/master/doc/load.png) - -On the Nosheep blog, Zach defines average load: "In short it is the -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. The first line -also display the number of CPU core. - -If average load is < O.7*Core, then status is set to "OK". - -If average load is > O.7*Core, then status is set to "CAREFUL". - -If average load is > 1*Core, then status is set to "WARNING". - -If average load is > 5*Core, then status is set to "CRITICAL". - -### Memory - -Glances uses two columns: one for the RAM and another one for the SWAP. - -![screenshot](https://github.com/nicolargo/glances/raw/master/doc/mem.png) - -If space is available, Glances displays extended informations: - -![screenshot](https://github.com/nicolargo/glances/raw/master/doc/mem-wide.png) - -With Glances, alerts are only set for on used swap and real memory. - -If memory is < 50%, then status is set to "OK". - -If memory is > 50%, then status is set to "CAREFUL". - -If memory is > 70%, then status is set to "WARNING". - -If memory is > 90%, then status is set to "CRITICAL". - -### Network bit rate - -![screenshot](https://github.com/nicolargo/glances/raw/master/doc/network.png) - -Glances display the network interface bit rate. The unit is adapted -dynamicaly (bits per second, Kbits per second, Mbits per second...). - -Alerts are set only if the network interface maximum speed is available. - -If bit rate is < 50%, then status is set to "OK". - -If bit rate is > 50%, then status is set to "CAREFUL". - -If bit rate is > 70%, then status is set to "WARNING". - -If bit rate is > 90%, then status is set to "CRITICAL". - -For example, on a 100 Mbps Ethernet interface, the warning status is set -if the bit rate is higher than 70 Mbps. - -### Sensors (optional; only available on Linux) - -![screenshot](https://github.com/nicolargo/glances/raw/master/doc/sensors.png) - -Optionally, Glances displays the sensors informations (lm-sensors). - -A filter is processed in order to only display temperature. - -You should enable this module using the following command line: - - glances -e - -There is no alert on this information. - -### Disk I/O - -![screenshot](https://github.com/nicolargo/glances/raw/master/doc/diskio.png) - -Glances displays the disk I/O throughput. The unit is adapted dynamically -(bytes per second, Kbytes per second, Mbytes per second...). - -There is no alert on this information. - -### Filesystem - -![screenshot](https://github.com/nicolargo/glances/raw/master/doc/fs.png) - -Glances displays the total and used filesytem disk space. The unit is -adapted dynamically (bytes per second, Kbytes per second, Mbytes per -second...). - -Alerts are set for used disk space: - -If disk used is < 50%, then status is set to "OK". - -If disk used is > 50%, then status is set to "CAREFUL". - -If disk used is > 70%, then status is set to "WARNING". - -If disk used is > 90%, then status is set to "CRITICAL". - -### Processes - -Short view: - -![screenshot](https://github.com/nicolargo/glances/raw/master/doc/processlist.png) - -Long view (only available if your terminal is wide enough) - -![screenshot](https://github.com/nicolargo/glances/raw/master/doc/processlist-wide.png) - -Glances displays a summary and a list of processes. - -By default (or if you hit the 'a' key) the process list is automatically -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 -* IO_R and IO_W: Per process IO read and write rate (in byte per second) -* NAME: Process name or command line - -### Logs - -![screenshot](https://github.com/nicolargo/glances/raw/master/doc/logs.png) - -A logs list is displayed in the bottom of the screen if (and only if): - -* at least one WARNING or CRITICAL alert was occured. -* space is available in the bottom of the console/terminal - -There is one line per alert with the following information: - -* start date -* end date -* alert name -* (min/avg/max) values - -### Footer - -![screenshot](https://github.com/nicolargo/glances/raw/master/doc/footer.png) - -Glances displays the current time/date and access to the embedded help screen. - -If you have ran Glances in client mode (-c), you can also see if the client is connected to the server. - -If client is connected: - -![screenshot](https://github.com/nicolargo/glances/raw/master/doc/client-connected.png) - -else: - -![screenshot](https://github.com/nicolargo/glances/raw/master/doc/client-disconnected.png) - -On the left, you can easely seen if you are connected to a Glances server. - -## Localisation - -Glances localization files exist for: - -* English (default langage) -* French -* Italian -* Spanish -* Portugal - -Feel free to contribute ! diff --git a/README.md b/README.md deleted file mode 100644 index 151274ff..00000000 --- a/README.md +++ /dev/null @@ -1,448 +0,0 @@ -[![Flattr this git repo](http://api.flattr.com/button/flattr-badge-large.png)](https://flattr.com/thing/484466/nicolargoglances-on-GitHub) -[![Build Status](https://travis-ci.org/nicolargo/glances.png?branch=master)](https://travis-ci.org/nicolargo/glances) - -============================= -Glances -- Eye on your system -============================= - -![screenshot](https://github.com/nicolargo/glances/raw/master/doc/glances-white-256.png) - -## Description - -Glances is a CLI curses based monitoring tool for GNU/Linux and BSD OS. - -Glances uses the PsUtil library to get information from your system. - -It is developed in Python. - -Console (80x24) screenshot: - -![screenshot](https://raw.github.com/nicolargo/glances/master/doc/screenshot.png) - -Wide terminal (> 90x24) screenshot: - -![screenshot](https://raw.github.com/nicolargo/glances/master/doc/screenshot-wide.png) - -## Installation - -Pre-requisites (information for packagers): - -* Python 2.6+ (not tested with Python 3+) -* build-essential (for installation via Pypi and setup.py) -* python-dev (for installation via Pypi) -* python-setuptools (for the installation via setup.py) -* python-psutil 0.4.1+ (replace the old libstatgrab's lib) -* python-jinja2 2.0+ (optional for HTML export) -* pysensors (Python library for sensors stats) - -### From package manager (very easy way) - -Packages exist for Debian (SID), Arch, Fedora, Redhat, FreeBSD... - -Check if the version is the latest one. - -### From PyPi (easy and cross platform way) - -PyPi is an official Python package manager. - -You first need to install PyPi on your system. For example on Debian/Ubuntu: - - $ sudo apt-get update - $ sudo apt-get install python-pip build-essential python-dev - -Then install the latest Glances version: - - $ sudo pip install Glances - -Note: if you are behind an HTTP Proxy, you should use instead: - - $ sudo pip install --proxy=user:password@url:port Glances - -### From [Homebrew](http://mxcl.github.com/homebrew/) for Mac OS X - - $ brew install brew-pip - $ export PYTHONPATH=$(brew --prefix)/lib/python2.7/site-packages - $ brew pip Glances - -If you have the following error: - - Error: Failed executing: pip install glances==1.X --install-option=--prefix=/usr/local/XXX/glances/1.X (.rb:) - -then try to run: - - $ pip install glances==1.X --install-option=--prefix=/usr/local/XXX/glances/1.X - $ brew link Glances - -### Concerning Windows operating system - -Thanks to Nicolas Bourges, a Windows installer is available: - -64 bits: https://s3.amazonaws.com/glances/glances-1.6.0-x64.exe -32 bits: https://s3.amazonaws.com/glances/glances-1.6.0-x86.exe - -If you want to install it manually, please read the following procedure. - -Windows operating system only support the Glances in server mode. So if you ran Glances on Windows, it will be automaticaly running in server mode. - -To install Glances on you system: - - * Install [Python for Windows](http://www.python.org/getit/) - * Install the [PsUtil lib](https://code.google.com/p/psutil/downloads/list) - * Download the latest [Glances version](https://raw.github.com/nicolargo/glances/master/glances/glances.py) - -I am looking for a contributor to package Glances for Windows (for exemple using [PyInstaller](http://www.pyinstaller.org/)). - -### From source - -Get the latest version (form GitHub): - - $ rm -rf /tmp/nicolargo-glances-* - $ wget -O /tmp/glances-last.tgz https://github.com/nicolargo/glances/tarball/master - -Glances use a standard GNU style installer (for a Debian like system): - - $ sudo apt-get update - $ sudo apt-get install python-setuptools build-essential python-dev - $ cd /tmp - $ tar zxvf glances-last.tgz - $ cd nicolargo-glances-* - $ sudo python setup.py install - -## From a configuration manager - -Puppet: https://github.com/rverchere/puppet-glances - -Chef: https://github.com/cookbooks/hw-chef-glances - -## Configuration - -No configuration is needed to use Glances. - -Furthermore, the release 1.6 introduces a configuration file to setup limits. - -The default configuration file is under: - - /etc/glances/glances.conf (Linux) -or - - /usr/local/etc/glances/glances.conf (*BSD and OS X) - -To override the default configuration, you can copy the `glances.conf` file to -your `$XDG_CONFIG_HOME` directory (e.g. Linux): - - mkdir -p $XDG_CONFIG_HOME/glances - cp /etc/glances/glances.conf $XDG_CONFIG_HOME/glances/ - -On OS X, you should copy the configuration file to `~/Library/Application Support/glances/`. - -## Running - -### In standalone mode - -If you want to monitor your local machine, just run: - - $ glances - -### In client/server mode - -If you want to remotely monitor a machine (called server) from another one (called client). - -Run this command on the server: - - server$ glances -s - -and this one on the client: - - client$ glances -c @server - -where @server is the IP address or hostname of the server - -Glances uses a [XML/RPC](http://docs.python.org/2/library/simplexmlrpcserver.html) server and can be used by another client software. - -In server mode, you can set the bind address (-B ADDRESS) and listenning TCP port (-p PORT). - -In client mode, you can set the TCP port of the server (-p port). - -Default binding address is 0.0.0.0 (Glances will listen on all the networks interfaces) and TCP port is 61209. - -In client/server mode, limits are set by the server side. - -The version 1.6 introduces a optionnal password to access to the server (-P password). - -## User guide - -Command line options are: - - -b Display network rate in Byte per second - -B @IP|host Bind server to the given IP or host NAME - -c @IP|host Connect to a Glances server - -C file Path to the configuration file - -d Disable disk I/O module - -e Enable the sensors module (Linux-only) - -f file Set the output folder (HTML) or file (CSV) - -h Display the syntax and exit - -m Disable mount module - -n Disable network module - -o output Define additional output (available: HTML or CSV) - -p PORT Define the client or server TCP port (default: 61209) - -P password Client/server password - -r Do not list processes (significant CPU use reduction) - -s Run Glances in server mode - -t sec Set the refresh time in seconds (default: 3) - -v Display the version and exit - -y Enable the hddtemp module - -z Do not use the bold color attribute - -Importants stats are colored: - -* GREEN: stat counter is "OK" -* BLUE: stat counter is "CAREFUL" -* MAGENTA: stat counter is "WARNING" -* RED: stat counter is "CRITICAL" - -When Glances is running, you can press: - -* 'a' to set the automatic mode. The processes are sorted automatically - - IF CPU IoWait > 60% sort by process "IO read and write" - - If CPU > 70%, sort by process "CPU consumption" - - If MEM > 70%, sort by process "memory size" - -* 'b' switch between bit/s or byte/s for network IO -* 'c' sort the processes list by CPU consumption -* 'd' disable or enable the disk IO stats -* 'e' enable the sensors module (PySensors library is needed; Linux-only) -* 'f' disable or enable the file system stats -* 'h' to display a help message with the keys you can press and the limits -* 'i' sort the processes list by IO rate (need root account on some OS) -* 'l' disable or enable the logs -* 'm' sort the processes list by process MEM -* 'n' disable or enable the network interfaces stats -* 'p' sort by process name -* 's' disable or enable the sensor stats (only available with -e tag) -* 't' View network IO as combination -* 'u' View cumulative network IO -* 'w' delete finished warning logs messages -* 'x' delete finished warning and critical logs messages -* '1' switch between global CPU and per core stats -* 'q' Exit - -### Header - -![screenshot](https://github.com/nicolargo/glances/raw/master/doc/header.png) - -The header shows the host name and the operating system name, version and architecture. - -### CPU - -Short view: - -![screenshot](https://github.com/nicolargo/glances/raw/master/doc/cpu.png) - -If horizontal space is available, extended CPU infomations are displayed. - -Extended view (only available if your terminal is wide enough) - -![screenshot](https://github.com/nicolargo/glances/raw/master/doc/cpu-wide.png) - -If user click on the '1' key, per CPU stats is displayed: - -![screenshot](https://github.com/nicolargo/glances/raw/master/doc/percpu.png) - -The CPU stats are shown as a percentage and for the configured refresh -time. The total CPU usage is displayed on the first line. - -Color code used: - -If user|kernel|nice CPU is < 50%, then status is set to "OK". - -If user|kernel|nice CPU is > 50%, then status is set to "CAREFUL". - -If user|kernel|nice CPU is > 70%, then status is set to "WARNING". - -If user|kernel|nice CPU is > 90%, then status is set to "CRITICAL". - -### Load - -![screenshot](https://github.com/nicolargo/glances/raw/master/doc/load.png) - -On the Nosheep blog, Zach defines average load: "In short it is the -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. The first line -also display the number of CPU core. - -If average load is < O.7*Core, then status is set to "OK". - -If average load is > O.7*Core, then status is set to "CAREFUL". - -If average load is > 1*Core, then status is set to "WARNING". - -If average load is > 5*Core, then status is set to "CRITICAL". - -### Memory - -Glances uses two columns: one for the RAM and another one for the SWAP. - -![screenshot](https://github.com/nicolargo/glances/raw/master/doc/mem.png) - -If space is available, Glances displays extended informations: - -![screenshot](https://github.com/nicolargo/glances/raw/master/doc/mem-wide.png) - -With Glances, alerts are only set for on used swap and real memory. - -If memory is < 50%, then status is set to "OK". - -If memory is > 50%, then status is set to "CAREFUL". - -If memory is > 70%, then status is set to "WARNING". - -If memory is > 90%, then status is set to "CRITICAL". - -### Network bit rate - -![screenshot](https://github.com/nicolargo/glances/raw/master/doc/network.png) - -Glances display the network interface bit rate. The unit is adapted -dynamicaly (bits per second, Kbits per second, Mbits per second...). - -Alerts are set only if the network interface maximum speed is available. - -If bit rate is < 50%, then status is set to "OK". - -If bit rate is > 50%, then status is set to "CAREFUL". - -If bit rate is > 70%, then status is set to "WARNING". - -If bit rate is > 90%, then status is set to "CRITICAL". - -For example, on a 100 Mbps Ethernet interface, the warning status is set -if the bit rate is higher than 70 Mbps. - -### Sensors (optional; only available on Linux) - -![screenshot](https://github.com/nicolargo/glances/raw/master/doc/sensors.png) - -Optionally, Glances displays the sensors informations (lm-sensors). - -A filter is processed in order to only display temperature. - -You should enable this module using the following command line: - - glances -e - -There is no alert on this information. - -### Disk I/O - -![screenshot](https://github.com/nicolargo/glances/raw/master/doc/diskio.png) - -Glances displays the disk I/O throughput. The unit is adapted dynamically -(bytes per second, Kbytes per second, Mbytes per second...). - -There is no alert on this information. - -### Filesystem - -![screenshot](https://github.com/nicolargo/glances/raw/master/doc/fs.png) - -Glances displays the total and used filesytem disk space. The unit is -adapted dynamically (bytes per second, Kbytes per second, Mbytes per -second...). - -Alerts are set for used disk space: - -If disk used is < 50%, then status is set to "OK". - -If disk used is > 50%, then status is set to "CAREFUL". - -If disk used is > 70%, then status is set to "WARNING". - -If disk used is > 90%, then status is set to "CRITICAL". - -### Processes - -Short view: - -![screenshot](https://github.com/nicolargo/glances/raw/master/doc/processlist.png) - -Long view (only available if your terminal is wide enough) - -![screenshot](https://github.com/nicolargo/glances/raw/master/doc/processlist-wide.png) - -Glances displays a summary and a list of processes. - -By default (or if you hit the 'a' key) the process list is automatically -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 -* IO_R and IO_W: Per process IO read and write rate (in byte per second) -* NAME: Process name or command line - -### Logs - -![screenshot](https://github.com/nicolargo/glances/raw/master/doc/logs.png) - -A logs list is displayed in the bottom of the screen if (and only if): - -* at least one WARNING or CRITICAL alert was occured. -* space is available in the bottom of the console/terminal - -There is one line per alert with the following information: - -* start date -* end date -* alert name -* (min/avg/max) values - -### Footer - -![screenshot](https://github.com/nicolargo/glances/raw/master/doc/footer.png) - -Glances displays the current time/date and access to the embedded help screen. - -If you have ran Glances in client mode (-c), you can also see if the client is connected to the server. - -If client is connected: - -![screenshot](https://github.com/nicolargo/glances/raw/master/doc/client-connected.png) - -else: - -![screenshot](https://github.com/nicolargo/glances/raw/master/doc/client-disconnected.png) - -On the left, you can easely seen if you are connected to a Glances server. - -## Localisation - -Glances localization files exist for: - -* English (default langage) -* French -* Italian -* Spanish -* Portugal - -Feel free to contribute ! diff --git a/README.rst b/README.rst new file mode 100644 index 00000000..e8094e33 --- /dev/null +++ b/README.rst @@ -0,0 +1,143 @@ +=============================== +Glances - An eye on your system +=============================== + +.. image:: http://api.flattr.com/button/flattr-badge-large.png + :target: https://flattr.com/thing/484466/nicolargoglances-on-GitHub +.. image:: https://travis-ci.org/nicolargo/glances.png?branch=master + :target: https://travis-ci.org/nicolargo/glances + +.. image:: docs/images/glances-white-256.png + :width: 128 + +**Glances** is a cross-platform curses-based monitoring tool written in Python. + +It uses the `psutil`_ library to get information from your system. + +.. image:: docs/images/screenshot-wide.png + +Requirements +============ + +- ``python >= 2.6`` (tested with version 2.6, 2.7, 3.2, 3.3) +- ``psutil >= 0.4.1`` (recommended version >= 0.6) +- ``jinja`` (optional for HTML output) +- ``pysensors`` (optional for HW monitoring support) +- ``hddtemp`` (optional for HDD temperature monitoring support) +- ``setuptools`` + +Installation +============ + +Actually, Glances is available for Arch Linux, Fedora / CentOS / RHEL, +Debian (Sid), Ubuntu (13.04+) and FreeBSD, so you should be able to +install it using your favorite package manager. + +Glances is on `PyPI`_. To install, simply use `pip`_: + +.. code-block:: console + + pip install Glances + +OS X +---- + +OS X users can also install Glances using `Homebrew`_ or `MacPorts`_. + +Homebrew +```````` + +.. code-block:: console + + $ brew install brew-pip + $ export PYTHONPATH=$(brew --prefix)/lib/python2.7/site-packages + $ brew pip Glances + +.. note:: If you get the following error: + + :: + + Error: Failed executing: pip install glances==X.X --install-option=--prefix=/usr/local/XXX/glances/X.X (.rb:) + + Try to run: + + .. code-block:: console + + $ pip install glances==X.X --install-option=--prefix=/usr/local/XXX/glances/X.X + $ brew link Glances + +MacPorts +```````` + +.. code-block:: console + + $ sudo port install glances + +Windows +------- + +Windows only support Glances in server mode. Glances will automatically run in server mode on it. + +Thanks to `Nicolas Bourges`, Glances can be easily installed using a Windows installer: + +- glances-1.6.0-x86.exe_ (32-bit, md5sum: 1d25902a2b1030f953a108792f4732cf) +- glances-1.6.0-x64.exe_ (64-bit, md5sum: de2c35c4bdd6a3ab2b938ea5f4c1567d) + +Otherwise, you have to follow these steps: + +- Install `Python for Windows`: http://www.python.org/getit/ +- Install the `psutil` library: https://code.google.com/p/psutil/downloads/list +- Download `Glances` from here: http://nicolargo.github.io/glances/ + +Source +------ + +To install Glances from source: + +.. code-block:: console + + $ curl -L https://github.com/nicolargo/glances/archive/vX.X.tar.gz -o glances-X.X.tar.gz + $ tar -zxvf glances-*.tar.gz + $ cd glances-* + # python setup.py install + +.. note:: On Debian/Ubuntu, you have to install first `build-essential` and `python-dev`. + +Puppet +------ + +You can install Glances using `Puppet`_: https://github.com/rverchere/puppet-glances + +Usage +===== + +Just run: + +.. code-block:: console + + $ glances [OPTIONS] + +Documentation +============= + +For complete documentation see ``glances-doc.html``. + +Author +====== + +Nicolas Hennion (@nicolargo) + +License +======= + +LGPL. See ``COPYING`` for more details. + + +.. _psutil: https://code.google.com/p/psutil/ +.. _PyPI: https://pypi.python.org/pypi +.. _pip: http://www.pip-installer.org/ +.. _Homebrew: http://mxcl.github.com/homebrew/ +.. _MacPorts: https://www.macports.org/ +.. _glances-1.6.0-x86.exe: https://s3.amazonaws.com/glances/glances-1.6.0-x86.exe +.. _glances-1.6.0-x64.exe: https://s3.amazonaws.com/glances/glances-1.6.0-x64.exe +.. _Puppet: https://puppetlabs.com/puppet/what-is-puppet/ diff --git a/TODO b/TODO index 3693bd08..0196988e 100644 --- a/TODO +++ b/TODO @@ -1,2 +1 @@ -- Need a packager/installer for Windows OS (Server mode only) -- Need translators contributions (Chines, Japon, ...) +- Need translators contributions (Chinese, Japanese, etc.) diff --git a/doc/all.png b/doc/all.png deleted file mode 100644 index fcf6d11e..00000000 Binary files a/doc/all.png and /dev/null differ diff --git a/docs/glances-doc.html b/docs/glances-doc.html new file mode 100644 index 00000000..4c477b1f --- /dev/null +++ b/docs/glances-doc.html @@ -0,0 +1,550 @@ + + + + + + +Glances + + + +
+

Glances

+ +

This manual describes Glances version 1.7.

+

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

+

April 2013

+ +
+

Introduction

+

Glances is a cross-platform curses-based 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 information.

+

Glances can adapt dynamically the displayed information depending on the +terminal size. It can also work in a client/server mode for remote monitoring.

+

Glances is written in Python and uses the psutil library to get information from your system.

+

Console (80x24)

+images/screenshot.png +

Full view (>80x24)

+images/screenshot-wide.png +
+
+

Usage

+
+

Standalone mode

+

Simply run:

+
+$ glances
+
+
+
+

Client/Server mode

+

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

+
+server$ glances -s
+
+

and on the client:

+
+client$ glances -c @server
+
+

where @server is the IP address or host name of the server.

+

In server mode, you can set the bind address -B ADDRESS and listening TCP port -p PORT.

+

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

+

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

+

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

+

The version 1.6 introduces a optional password to access to the server -P password.

+
+
+
+

Command reference

+
+

Command-line options

+ +++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+-bDisplay network rate in Byte per second
+-B IPBind server to the given IP or hostname
+-c IPConnect to a Glances server
+-C filePath to the configuration file (default: {/usr/local,}/etc/glances/glances.conf)
+-dDisable disk I/O module
+-eEnable the sensors module (Linux-only)
+-f fileSet the output folder (HTML) or file (CSV)
+-hDisplay the help and exit
+-mDisable mount module
+-nDisable network module
+-o outputDefine additional output (available: HTML or CSV)
+-p PORTDefine the client or server TCP port (default: 61209)
+-P passwordDefine a client/server password
+-rDo not list processes
+-sRun Glances in server mode
+-t secSet the refresh time in seconds (default: 3)
+-vDisplay the version and exit
+-yEnable the hddtemp module (needs running hddtemp daemon)
+-zDo not use the bold color attribute
+
+
+

Interactive commands

+

The following commands are supported while in Glances:

+
+
a
+

Automatic mode. The processes are sorted automatically.

+
    +
  • If CPU iowait >60%, sort processes by IO read and write
    • +
  • If CPU >70%, sort processes by CPU usage
    • +
  • If MEM >70%, sort processes by memory usage
    • +
+
+
b
+
Switch between bit/s or Byte/s for network IO
+
c
+
Sort processes by CPU%
+
d
+
Show/hide disk I/O stats
+
f
+
Show/hide file system stats
+
h
+
Show/hide the help message (with the keys you can press and the limits)
+
i
+
Sort processes by IO rate (need root account on some OS)
+
l
+
Show/hide log messages
+
m
+
Sort processes by MEM%
+
n
+
Show/hide network stats
+
p
+
Sort processes by name
+
s
+
Show/hide sensors stats (only available with -e flag; pysensors library is needed; Linux-only)
+
t
+
View network IO as combination
+
u
+
View cumulative network IO
+
w
+
Delete finished warning log messages
+
x
+
Delete finished warning and critical log messages
+
1
+
Switch between global CPU and per-CPU stats
+
q
+
Quit
+
+
+
+
+

Configuration

+

No configuration is needed to use Glances.

+

Furthermore, starting from release 1.6, it has been introduced a configuration file for setup limits.

+

By default, the configuration file is under:

+
+/etc/glances/glances.conf (Linux)
+
+

or:

+
+/usr/local/etc/glances/glances.conf (*BSD and OS X)
+
+

To override the default configuration, you can copy the glances.conf file to +your $XDG_CONFIG_HOME directory (e.g. Linux):

+
+mkdir -p $XDG_CONFIG_HOME/glances
+cp /etc/glances/glances.conf $XDG_CONFIG_HOME/glances/
+
+

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

+
+
+

Anatomy of the application

+
+

Legend

+
+
GREEN stat counter is "OK"
+
BLUE stat counter is "CAREFUL"
+
MAGENTA stat counter is "WARNING"
+
RED stat counter is "CRITICAL"
+
+
+ +
+

CPU

+

Short view:

+images/cpu.png +

If enough horizontal space is available, extended CPU informations are displayed.

+

Extended view:

+images/cpu-wide.png +

To switch to per-CPU stats, just hit the 1 key:

+images/per-cpu.png +

The CPU stats are shown as a percentage and for the configured refresh time. +The total CPU usage is displayed on the first line.

+
+
If user|system|nice CPU is <50%, then status is set to "OK"
+
If user|system|nice CPU is >50%, then status is set to "CAREFUL"
+
If user|system|nice CPU is >70%, then status is set to "WARNING"
+
If user|system|nice CPU is >90%, then status is set to "CRITICAL"
+
+
+
+

Load

+images/load.png +

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

+
+"In short it is the 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 core to adapt the alerts. +Alerts on average load are only set on 5 and 15 min. +The first line also display the number of CPU core.

+
+
If average load is <0.7*core, then status is set to "OK"
+
If average load is >0.7*core, then status is set to "CAREFUL"
+
If average load is >1*core, then status is set to "WARNING"
+
If average load is >5*core, then status is set to "CRITICAL"
+
+
+
+

Memory

+

Glances uses two columns: one for the RAM and another one for the Swap.

+images/mem.png +

If enough space is available, Glances displays extended informations:

+images/mem-wide.png +

With Glances, alerts are only set for on used memory and used swap.

+
+
If memory is <50%, then status is set to "OK"
+
If memory is >50%, then status is set to "CAREFUL"
+
If memory is >70%, then status is set to "WARNING"
+
If memory is >90%, then status is set to "CRITICAL"
+
+
+
+

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).

+

Alerts are only set if the network interface maximum speed is available.

+

For example, on a 100 Mbps ethernet interface, the warning status is set +if the bit rate is higher than 70 Mbps.

+
+
If bit rate is <50%, then status is set to "OK"
+
If bit rate is >50%, then status is set to "CAREFUL"
+
If bit rate is >70%, then status is set to "WARNING"
+
If bit rate is >90%, then status is set to "CRITICAL"
+
+
+
+

Sensors

+images/sensors.png +

Glances can displays the sensors informations trough lm-sensors (only +available on Linux).

+

A filter is processed in order to only display temperature.

+

You should enable this module using the following command line:

+
+$ glances -e
+
+

There is no alert on this information.

+
+
+

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.

+
+
+

File system

+images/fs.png +

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

+

Alerts are set for used disk space:

+
+
If disk used is <50%, then status is set to "OK"
+
If disk used is >50%, then status is set to "CAREFUL"
+
If disk used is >70%, then status is set to "WARNING"
+
If disk used is >90%, then status is set to "CRITICAL"
+
+
+
+

Processes list

+

Compact view:

+images/processlist.png +

Full view:

+images/processlist-wide.png +

Glances displays a summary and a list of processes.

+

By default, or if you hit the a key, the processes list is automatically +sorted by CPU of memory usage.

+

The number of processes in the list is adapted to the screen size.

+
+
VIRT
+
Virtual memory size
+
RES
+
Resident memory
+
CPU%
+
% of CPU used by the process
+
MEM%
+
% of MEM used by the process
+
PID
+
Process ID
+
USER
+
User ID per process
+
NI
+
Nice level of the process
+
S
+
Process status
+
TIME+
+
Cumulative CPU time used
+
IOR/s
+
Per process IO read rate (in Byte/s)
+
IOW/s
+
Per process IO write rate (in Byte/s)
+
NAME
+
Process name or command line
+
+

Process status legend:

+
+
R
+
running
+
S
+
sleeping (may be interrupted)
+
D
+
disk sleep (may not be interrupted)
+
T
+
traced/stopped
+
Z
+
zombie
+
+
+
+

Logs

+images/logs.png +

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

+
    +
  • at least one WARNING or CRITICAL alert was occurred
    • +
  • space is available in the bottom of the console/terminal
    • +
+

Each alert message displays the following information:

+
    +
  1. start date
    2. +
  2. end date
    3. +
  3. alert name
    4. +
  4. {min/avg/max} values
    5. +
+
+ +
+
+

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-API-How-To

+
+
+

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 new file mode 100644 index 00000000..1abb548b --- /dev/null +++ b/docs/glances-doc.rst @@ -0,0 +1,427 @@ +======= +Glances +======= + +This manual describes *Glances* version 1.7. + +Copyright © 2012-2013 Nicolas Hennion + +April 2013 + +.. contents:: Table of Contents + +Introduction +============ + +Glances is a cross-platform curses-based 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 information. + +Glances can adapt dynamically the displayed information depending on the +terminal size. It can also work in a client/server mode for remote monitoring. + +Glances is written in Python and uses the `psutil`_ library to get information from your system. + +Console (80x24) + +.. image:: images/screenshot.png + +Full view (>80x24) + +.. image:: images/screenshot-wide.png + +Usage +===== + +Standalone mode +--------------- + +Simply run: + +.. code-block:: console + + $ glances + +Client/Server mode +------------------ + +If you want to remotely monitor a machine, called ``server``, from another one, called ``client``, +just run on the server: + +.. code-block:: console + + server$ glances -s + +and on the client: + +.. code-block:: console + + client$ glances -c @server + +where ``@server`` is the IP address or host name of the server. + +In server mode, you can set the bind address ``-B ADDRESS`` and listening TCP port ``-p PORT``. + +In client mode, you can set the TCP port of the server ``-p PORT``. + +Default binding address is ``0.0.0.0`` (Glances will listen on all the network interfaces) and TCP port is ``61209``. + +In client/server mode, limits are set by the server side. + +The version 1.6 introduces a optional password to access to the server ``-P password``. + +Command reference +================= + +Command-line options +-------------------- + +-b Display network rate in Byte per second +-B IP Bind server to the given IP or hostname +-c IP Connect to a Glances server +-C file Path to the configuration file (default: {/usr/local,}/etc/glances/glances.conf) +-d Disable disk I/O module +-e Enable the sensors module (Linux-only) +-f file Set the output folder (HTML) or file (CSV) +-h Display the help and exit +-m Disable mount module +-n Disable network module +-o output Define additional output (available: HTML or CSV) +-p PORT Define the client or server TCP port (default: 61209) +-P password Define a client/server password +-r Do not list processes +-s Run Glances in server mode +-t sec Set the refresh time in seconds (default: 3) +-v Display the version and exit +-y Enable the hddtemp module (needs running hddtemp daemon) +-z Do not use the bold color attribute + +Interactive commands +-------------------- + +The following commands are supported while in Glances: + + +``a`` + Automatic mode. The processes are sorted automatically. + + - If CPU iowait ``>60%``, sort processes by IO read and write + - If CPU ``>70%``, sort processes by CPU usage + - If MEM ``>70%``, sort processes by memory usage +``b`` + Switch between bit/s or Byte/s for network IO +``c`` + Sort processes by CPU% +``d`` + Show/hide disk I/O stats +``f`` + Show/hide file system stats +``h`` + Show/hide the help message (with the keys you can press and the limits) +``i`` + Sort processes by IO rate (need root account on some OS) +``l`` + Show/hide log messages +``m`` + Sort processes by MEM% +``n`` + Show/hide network stats +``p`` + Sort processes by name +``s`` + Show/hide sensors stats (only available with -e flag; pysensors library is needed; Linux-only) +``t`` + View network IO as combination +``u`` + View cumulative network IO +``w`` + Delete finished warning log messages +``x`` + Delete finished warning and critical log messages +``1`` + Switch between global CPU and per-CPU stats +``q`` + Quit + +Configuration +============= + +No configuration is needed to use Glances. + +Furthermore, starting from release 1.6, it has been introduced a configuration file for setup limits. + +By default, the configuration file is under: + +.. code-block:: console + + /etc/glances/glances.conf (Linux) + +or: + +.. code-block:: console + + /usr/local/etc/glances/glances.conf (*BSD and OS X) + +To override the default configuration, you can copy the ``glances.conf`` file to +your ``$XDG_CONFIG_HOME`` directory (e.g. Linux): + +.. code-block:: console + + mkdir -p $XDG_CONFIG_HOME/glances + cp /etc/glances/glances.conf $XDG_CONFIG_HOME/glances/ + +On OS X, you should copy the configuration file to ``~/Library/Application Support/glances/``. + +Anatomy of the application +========================== + +Legend +------ + +| ``GREEN`` stat counter is ``"OK"`` +| ``BLUE`` stat counter is ``"CAREFUL"`` +| ``MAGENTA`` stat counter is ``"WARNING"`` +| ``RED`` stat counter is ``"CRITICAL"`` + +Header +------ + +.. image:: images/header.png + +The header shows the OS name, release version, platform architecture and the host name. +On Linux, it shows also the kernel version. + +CPU +--- + +Short view: + +.. image:: images/cpu.png + +If enough horizontal space is available, extended CPU informations are displayed. + +Extended view: + +.. image:: images/cpu-wide.png + +To switch to per-CPU stats, just hit the ``1`` key: + +.. image:: images/per-cpu.png + +The CPU stats are shown as a percentage and for the configured refresh time. +The total CPU usage is displayed on the first line. + +| If user|system|nice CPU is ``<50%``, then status is set to ``"OK"`` +| If user|system|nice CPU is ``>50%``, then status is set to ``"CAREFUL"`` +| If user|system|nice CPU is ``>70%``, then status is set to ``"WARNING"`` +| If user|system|nice CPU is ``>90%``, then status is set to ``"CRITICAL"`` + +Load +---- + +.. image:: images/load.png + +On the *No Sheep* blog, *Zachary Tirrell* defines the average load [1]_: + + "In short it is the 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 core to adapt the alerts. +Alerts on average load are only set on 5 and 15 min. +The first line also display the number of CPU core. + +| If average load is ``<0.7*core``, then status is set to ``"OK"`` +| If average load is ``>0.7*core``, then status is set to ``"CAREFUL"`` +| If average load is ``>1*core``, then status is set to ``"WARNING"`` +| If average load is ``>5*core``, then status is set to ``"CRITICAL"`` + +Memory +------ + +Glances uses two columns: one for the ``RAM`` and another one for the ``Swap``. + +.. image:: images/mem.png + +If enough space is available, Glances displays extended informations: + +.. image:: images/mem-wide.png + +With Glances, alerts are only set for on used memory and used swap. + +| If memory is ``<50%``, then status is set to ``"OK"`` +| If memory is ``>50%``, then status is set to ``"CAREFUL"`` +| If memory is ``>70%``, then status is set to ``"WARNING"`` +| If memory is ``>90%``, then status is set to ``"CRITICAL"`` + +Network +------- + +.. image:: 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). + +Alerts are only set if the network interface maximum speed is available. + +For example, on a 100 Mbps ethernet interface, the warning status is set +if the bit rate is higher than 70 Mbps. + +| If bit rate is ``<50%``, then status is set to ``"OK"`` +| If bit rate is ``>50%``, then status is set to ``"CAREFUL"`` +| If bit rate is ``>70%``, then status is set to ``"WARNING"`` +| If bit rate is ``>90%``, then status is set to ``"CRITICAL"`` + +Sensors +------- + +.. image:: images/sensors.png + +Glances can displays the sensors informations trough `lm-sensors` (only +available on Linux). + +A filter is processed in order to only display temperature. + +You should enable this module using the following command line: + +.. code-block:: console + + $ glances -e + +There is no alert on this information. + +Disk I/O +-------- + +.. image:: images/diskio.png + +Glances displays the disk I/O throughput. The unit is adapted dynamically. + +There is no alert on this information. + +File system +----------- + +.. image:: images/fs.png + +Glances displays the used and total file system disk space. The unit is +adapted dynamically. + +Alerts are set for used disk space: + +| If disk used is ``<50%``, then status is set to ``"OK"`` +| If disk used is ``>50%``, then status is set to ``"CAREFUL"`` +| If disk used is ``>70%``, then status is set to ``"WARNING"`` +| If disk used is ``>90%``, then status is set to ``"CRITICAL"`` + +Processes list +-------------- + +Compact view: + +.. image:: images/processlist.png + +Full view: + +.. image:: images/processlist-wide.png + +Glances displays a summary and a list of processes. + +By default, or if you hit the ``a`` key, the processes list is automatically +sorted by CPU of memory usage. + +The number of processes in the list is adapted to the screen size. + +``VIRT`` + Virtual memory size +``RES`` + Resident memory +``CPU%`` + % of CPU used by the process +``MEM%`` + % of MEM used by the process +``PID`` + Process ID +``USER`` + User ID per process +``NI`` + Nice level of the process +``S`` + Process status +``TIME+`` + Cumulative CPU time used +``IOR/s`` + Per process IO read rate (in Byte/s) +``IOW/s`` + Per process IO write rate (in Byte/s) +``NAME`` + Process name or command line + +Process status legend: + +``R`` + running +``S`` + sleeping (may be interrupted) +``D`` + disk sleep (may not be interrupted) +``T`` + traced/stopped +``Z`` + zombie + +Logs +---- + +.. image:: images/logs.png + +A log messages list is displayed in the bottom of the screen if (and only if): + +- at least one ``WARNING`` or ``CRITICAL`` alert was occurred +- space is available in the bottom of the console/terminal + +Each alert message displays the following information: + +1. start date +2. end date +3. alert name +4. {min/avg/max} values + +Footer +------ + +.. image:: images/footer.png + +Glances displays the current date & time and access to the embedded help screen. + +If you have ran Glances in client mode ``-c``, you can also see if the client is connected to the server. + +If client is connected: + +.. image:: images/client-connected.png + +else: + +.. image:: images/client-disconnected.png + +On the left, you can easily see if you are connected to a Glances server. + +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-API-How-To + +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/ + +.. _psutil: https://code.google.com/p/psutil/ +.. _XML-RPC server: http://docs.python.org/2/library/simplexmlrpcserver.html diff --git a/doc/client-connected.png b/docs/images/client-connected.png similarity index 100% rename from doc/client-connected.png rename to docs/images/client-connected.png diff --git a/doc/client-disconnected.png b/docs/images/client-disconnected.png similarity index 100% rename from doc/client-disconnected.png rename to docs/images/client-disconnected.png diff --git a/doc/cpu-wide.png b/docs/images/cpu-wide.png similarity index 100% rename from doc/cpu-wide.png rename to docs/images/cpu-wide.png diff --git a/doc/cpu.png b/docs/images/cpu.png similarity index 100% rename from doc/cpu.png rename to docs/images/cpu.png diff --git a/doc/diskio.png b/docs/images/diskio.png similarity index 100% rename from doc/diskio.png rename to docs/images/diskio.png diff --git a/doc/footer.png b/docs/images/footer.png similarity index 100% rename from doc/footer.png rename to docs/images/footer.png diff --git a/doc/fs.png b/docs/images/fs.png similarity index 100% rename from doc/fs.png rename to docs/images/fs.png diff --git a/doc/glances-white-256.png b/docs/images/glances-white-256.png similarity index 100% rename from doc/glances-white-256.png rename to docs/images/glances-white-256.png diff --git a/doc/header.png b/docs/images/header.png similarity index 100% rename from doc/header.png rename to docs/images/header.png diff --git a/doc/load.png b/docs/images/load.png similarity index 100% rename from doc/load.png rename to docs/images/load.png diff --git a/doc/logs.png b/docs/images/logs.png similarity index 100% rename from doc/logs.png rename to docs/images/logs.png diff --git a/doc/mem-wide.png b/docs/images/mem-wide.png similarity index 100% rename from doc/mem-wide.png rename to docs/images/mem-wide.png diff --git a/doc/mem.png b/docs/images/mem.png similarity index 100% rename from doc/mem.png rename to docs/images/mem.png diff --git a/doc/network.png b/docs/images/network.png similarity index 100% rename from doc/network.png rename to docs/images/network.png diff --git a/doc/percpu.png b/docs/images/percpu.png similarity index 100% rename from doc/percpu.png rename to docs/images/percpu.png diff --git a/doc/processlist-wide.png b/docs/images/processlist-wide.png similarity index 100% rename from doc/processlist-wide.png rename to docs/images/processlist-wide.png diff --git a/doc/processlist.png b/docs/images/processlist.png similarity index 100% rename from doc/processlist.png rename to docs/images/processlist.png diff --git a/doc/screenshot-wide.png b/docs/images/screenshot-wide.png similarity index 100% rename from doc/screenshot-wide.png rename to docs/images/screenshot-wide.png diff --git a/doc/screenshot.png b/docs/images/screenshot.png similarity index 100% rename from doc/screenshot.png rename to docs/images/screenshot.png diff --git a/doc/sensors.png b/docs/images/sensors.png similarity index 100% rename from doc/sensors.png rename to docs/images/sensors.png diff --git a/doc/init_script b/docs/init_script similarity index 100% rename from doc/init_script rename to docs/init_script diff --git a/docs/man/glances.1 b/docs/man/glances.1 new file mode 100644 index 00000000..6850fe30 --- /dev/null +++ b/docs/man/glances.1 @@ -0,0 +1,143 @@ +.TH glances 1 "April, 2013" "version 1.7" "USER COMMANDS" +.SH NAME +glances \- A cross-platform curses-based monitoring tool +.SH SYNOPSIS +.B glances +[\-bdehmnrsvyz] [\-B bind] [\-c server] [\-C conffile] [\-f file] [\-o output] [\-p port] [\-P password] [\-t refresh] +.SH DESCRIPTION +Glances is a free (LGPL) cross-platform curses-based 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 additionnal information. +Glances can adapt dynamically the displayed information depending on the terminal size. +It can also work in a client/server mode for remote monitoring. +.PP +This tool is written in Python and uses psutil to fetch the statistical values from key elements. +.PP +The current version grab the following stats: CPU, Load, Memory, Network rate, Disk I/O, file system, +process number and details. +.SH COMMAND-LINE OPTIONS +The command-line options are the following: +.TP +.B \-b +Display network rate in Byte per second +.TP +.B \-B @IP|host +Bind server to the given IP or hostname +.TP +.B \-c @IP|host +Connect to a Glances server +.TP +.B \-C file +Path to the configuration file (default: {/usr/local,}/etc/glances/glances.conf) +.TP +.B \-d +Disable disk I/O module +.TP +.B \-e +Enable the sensors module (Linux-only) +.TP +.B \-f file +Set the output folder (HTML) or file (CSV) +.TP +.B \-h +Display the help and exit +.TP +.B \-m +Disable mount module +.TP +.B \-n +Disable network module +.TP +.B \-o output +Define additional output (available: HTML or CSV) +.TP +.B \-p PORT +Define the client or server TCP port (default: 61209) +.TP +.B \-P password +Define a client/server password +.TP +.B \-r +Do not list processes +.TP +.B \-s +Run Glances in server mode +.TP +.B \-t sec +Set the refresh time in seconds (default: 3) +.TP +.B \-v +Display the version and exit +.TP +.B \-y +Enable the hddtemp module (requires running hddtemp daemon) +.TP +.B \-z +Do not use the bold color attribute +.SH INTERACTIVE COMMANDS +You can use the following keys while in Glances: +.TP +.B a +Automatic mode. The process list is sorted automatically +.TP +.B b +Switch between bit/s or Byte/s for network IO +.TP +.B c +Sort processes by CPU% +.TP +.B d +Show/hide disk IO stats +.TP +.B f +Show/hide file system stats +.TP +.B h +Show/hide the help message +.TP +.B i +Sort processes by IO rate +.TP +.B l +Show/hide log messages +.TP +.B m +Sort processes by MEM% +.TP +.B n +Show/hide network stats +.TP +.B p +Sort processes by name +.TP +.B s +Show/hide sensors stats (Linux-only) +.TP +.B t +View network IO as combination +.TP +.B u +View cumulative network IO +.TP +.B w +Delete finished warning log messages +.TP +.B x +Delete finished warning and critical log messages +.TP +.B 1 +Switch between global CPU and per-CPU stats +.TP +.B q +Quit +.SH EXAMPLES +.TP +Refresh information every 5 seconds: +.B glances +\-t 5 +.PP +.SH EXIT STATUS +Glances returns a zero exit status if it succeeds to print/grab information. +.PP +It returns 2 if it fails to parse its options (missing arguments, invalid value, etc). +.SH AUTHOR +Glances is written by Nicolas Hennion aka Nicolargo (contact@nicolargo.com) diff --git a/docs/stylesheet.css b/docs/stylesheet.css new file mode 100644 index 00000000..7dd4b97a --- /dev/null +++ b/docs/stylesheet.css @@ -0,0 +1,109 @@ +/* +:Author: Alessio Sergi +:Contact: al3hex at gmail dot com + +Stylesheet for use with Docutils. + +This file is the CSS for the Glances documentation. +*/ + +body { + margin-top: 1em; + margin-left: 1em; + max-width: 80em; + font-family: serif; + font-size: 16px; +} + +h1 { + font-size: 20px; +} + +h1.title { + font-size: 22px; +} + +h2, h3, p.topic-title { + font-size: 18px; +} + +.first { + /* override p.topic-title margin styles */ + margin-top: 0 ! important; +} + +a { + color: #0055df; + text-decoration: none; +} + +a:hover { + color: #339999; + text-decoration: underline; +} + +a:visited { + color: #800080; +} + +a.toc-backref { + text-decoration: none; + color: black; +} + +blockquote { + padding-left: 1ex; + border-left: 1px solid #008000; + max-width: 30em; +} + +p.topic-title { + font-weight: bold; +} + +pre.code { + margin-left: 2em; + margin-right: 2em; +} + +.console { + background-color: #eeeeee; + border: 1px solid #cccccc; + max-width: 60em; + line-height: 19px; + overflow: auto; + padding: 6px 10px; + border-radius: 3px 3px 3px 3px; +} + +span.option, tt.docutils { + white-space: nowrap; + border: 1px dotted #008000; + padding: 1px; + background-color: #eeeeee; +} + +.literal, .literal-block, .option, .var { + font-family: monospace; + font-size: 10pt; +} + +dl.docutils { + margin-left: 2em; +} + +dl.docutils dd { + margin-bottom: 0.5em; +} + +ol.simple { + margin-left: 0.5em; +} + +table.docutils { + margin-left: 2em; +} + +td.option-group { + padding-right: 1em; +} diff --git a/glances/glances.py b/glances/glances.py index 0a7439c0..d329960c 100644 --- a/glances/glances.py +++ b/glances/glances.py @@ -703,7 +703,7 @@ class glancesGrabSensors: class glancesGrabHDDTemp: """ Get hddtemp stats using a socket connection - """ + """ cache = "" address = "127.0.0.1" @@ -747,7 +747,7 @@ class glancesGrabHDDTemp: return else: # Considering the size of "|/dev/sda||0||" as the minimum - if len(data) < 14: + if len(data) < 14: if len(self.cache) == 0: data = "|hddtemp error||0||" else: @@ -889,7 +889,7 @@ class GlancesStats: """ self._init_host() - + # Init the grab error tags # for managing error during stats grab # By default, we *hope* that there is no error @@ -1418,7 +1418,7 @@ class GlancesStatsClient(GlancesStats): try: self.hddtemp = input_stats["hddtemp"] except: - self.hddtemp = [] + self.hddtemp = [] try: self.diskio = input_stats["diskio"] except: @@ -1465,7 +1465,7 @@ class glancesScreen: self.sensors_x = 0 self.sensors_y = -1 self.hddtemp_x = 0 - self.hddtemp_y = -1 + self.hddtemp_y = -1 self.diskio_x = 0 self.diskio_y = -1 self.fs_x = 0 @@ -1971,15 +1971,15 @@ class glancesScreen: hddtemp_count = self.displayHDDTemp(stats.getHDDTemp(), self.network_y + network_count + sensors_count) diskio_count = self.displayDiskIO(stats.getDiskIO(), - offset_y = self.network_y + sensors_count + + offset_y = self.network_y + sensors_count + network_count + hddtemp_count, error = stats.diskio_error_tag) fs_count = self.displayFs(stats.getFs(), self.network_y + sensors_count + - network_count + diskio_count + + network_count + diskio_count + hddtemp_count) log_count = self.displayLog(self.network_y + sensors_count + network_count + - diskio_count + fs_count + + diskio_count + fs_count + hddtemp_count) self.displayProcess(processcount, processlist, stats.getSortedBy(), log_count=log_count, core=stats.getCore()) @@ -2355,7 +2355,7 @@ class glancesScreen: return 0 if memswap['total'] == 0: # If swap is null, then do not display it - return 0 + return 0 # Swap self.term_window.addnstr(self.mem_y, @@ -3675,7 +3675,7 @@ def printSyntax(): print(_("\t-t sec\t\tSet the refresh time in seconds (default: %d)" % refresh_time)) print(_("\t-v\t\tDisplay the version and exit")) - print(_("\t-y\t\tEnable the hddtemp module (needs running hddtemp daemon)")) + print(_("\t-y\t\tEnable the hddtemp module (needs running hddtemp daemon)")) print(_("\t-z\t\tDo not use the bold color attribute")) diff --git a/i18n-gen.sh b/i18n-gen.sh index 4bdd4834..f8a90736 100644 --- a/i18n-gen.sh +++ b/i18n-gen.sh @@ -12,8 +12,7 @@ LANG_LIST='es fr it pt_BR' xgettext --language=Python --keyword=_ --output=./i18n/glances.pot ./glances/glances.py -for i in `echo $LANG_LIST` -do +for i in $LANG_LIST; do echo "Generate language pack for: $i" msgmerge --update --no-fuzzy-matching --backup=off ./i18n/$i/LC_MESSAGES/glances.po ./i18n/glances.pot msgfmt ./i18n/$i/LC_MESSAGES/glances.po --output-file ./i18n/$i/LC_MESSAGES/glances.mo diff --git a/man/glances.1 b/man/glances.1 deleted file mode 100644 index f89fc4e0..00000000 --- a/man/glances.1 +++ /dev/null @@ -1,155 +0,0 @@ -.TH glances 1 "January, 2013" "version 1.6.1" "USER COMMANDS" -.SH NAME -glances \- CLI curses based monitoring tool -.SH SYNOPSIS -.B glances -[\-bdehmnsvz] [\-C conffile] [\-t refresh] [\-B bind] [\-c server] [\-p port] [\-P password] [\-o output] [\-f file] -.SH DESCRIPTION -Glances is a free (LGPL) curses-based 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 additionnal information. -Glances can adapt dynamicaly the displayed information depending on the terminal size. -It can also work in a client/server mode (for remote monitoring). -.PP -This tool is written in Python and uses PsUtil to fetch the statistical values from key elements. -.PP -The command line options are the following: -.PP - -b Display network rate in Byte per second -.PP - -B @IP|host Bind server to the given IP or host NAME -.PP - -c @IP|host Connect to a Glances server -.PP - -C file Path to the configuration file -.PP - -d Disable disk I/O module -.PP - -e Enable the sensors module (Linux-only) -.PP - -f file Set the output folder (HTML) or file (CSV) -.PP - -h Display the syntax and exit -.PP - -m Disable mount module -.PP - -n Disable network module -.PP - -o output Define additional output (available: HTML or CSV) -.PP - -p PORT Define the client or server TCP port (default: 61209) -.PP - -P password Client/server password -.PP - -r Do not list processes (significant CPU use reduction) -.PP - -s Run Glances in server mode -.PP - -t sec Set the refresh time in seconds (default: 3) -.PP - -v Display the version and exit -.PP - -y Enable the hddtemp module (requires running hddtemp daemon) -.PP - -z Do not use the bold color attribute -.PP -When Glances is running, you can use the following keys: -.PP - 'a' Automatic mode. The process list is sorted automatically -.PP - 'b' Switch between bit/s or Byte/s for network IO -.PP - 'c' Sort processes by CPU% -.PP - 'd' Show/hide disk IO stats -.PP - 'f' Show/hide file system stats -.PP - 'h' Show/hide the help message -.PP - 'i' Sort processes by IO rate -.PP - 'l' Show/hide log messages -.PP - 'm' Sort processes by MEM% -.PP - 'n' Show/hide network stats -.PP - 'p' Sort processes by name -.PP - 's' Show/hide sensors stats (Linux-only) -.PP - 'w' Delete finished warning logs messages -.PP - 'x' Delete finished warning and critical logs -.PP - 'q' Quit -.PP - '1' Switch between global CPU and per core stats -.PP -The current version grab the following stats: CPU, Load, Memory, Network rate, Disk IO, file system, -process number and details. -.SH OPTIONS -.TP -.TP -\-b -Display network rate in Byte per second -.TP -\-B bind -Bind server to the given IP or host NAME -.TP -\-c server -Connect to a Glances server (IP address or hostname) -.TP -\-C conffile -Use a configuration file (default: {/usr/local,}/etc/glances/glances.conf) -.TP -\-d -Disable disk I/O module -.TP -\-e -Enable the sensors module (Linux-only) -.TP -\-f file -Set the output folder (HTML) or file (CSV) -.TP -\-h -Display the syntax and exit -.TP -\-m -Disable mount module -.TP -\-n -Disable network module -.TP -\-o output -Define additional output (available: HTML or CSV) -.TP -\-p port -Define the client or server TCP port (default: 61209) -.TP -\-P password -Define the client or server password (default: no password) -.TP -\-s -Run Glances in server mode -.TP -\-t sec -Set the refresh time in seconds (default: 3) -.TP -\-v -Display the version and exit -.TP -\-z -Do not use the bold color attribute -.SH EXAMPLES -.TP -Refresh information every 5 seconds: -.B glances -\-t 5 -.PP -.SH EXIT STATUS -Glances returns a zero exit status if it succeeds to print/grab information. -.PP -It returns 2 if it fails to parse its options (missing arguments, invalid value, etc). -.SH AUTHOR -Glances is written by Nicolas Hennion aka Nicolargo (contact@nicolargo.com). diff --git a/setup.py b/setup.py index b4957586..7c0d3554 100755 --- a/setup.py +++ b/setup.py @@ -7,16 +7,14 @@ import glob from setuptools import setup data_files = [ - ('share/man/man1', ['man/glances.1']), - ('share/doc/glances', ['AUTHORS', - 'COPYING', - 'NEWS', - 'README', + ('share/doc/glances', ['AUTHORS', 'COPYING', 'NEWS', 'README.rst', + 'docs/glances-doc.html', 'glances/conf/glances.conf']), - ('share/doc/glances/doc', glob.glob('doc/*.png')), + ('share/doc/glances/images', glob.glob('docs/images/*.png')), ('share/glances/css', glob.glob('glances/data/css/*.css')), ('share/glances/html', glob.glob('glances/data/html/*.html')), ('share/glances/img', glob.glob('glances/data/img/*.png')), + ('share/man/man1', ['docs/man/glances.1']) ] if hasattr(sys, 'real_prefix') or ('bsd' or 'darwin' in sys.platform): @@ -31,22 +29,37 @@ for mo in glob.glob('i18n/*/LC_MESSAGES/*.mo'): setup( name='Glances', version='1.7a', - download_url='https://s3.amazonaws.com/glances/glances-1.7a.tar.gz', - url='https://github.com/nicolargo/glances', - description='CLI curses-based monitoring tool', + 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-1.7a.tar.gz', license="LGPL", keywords="cli curses monitoring system", - long_description=open('README').read(), - test_suite="glances.tests", install_requires=['psutil>=0.4.1'], - packages=['glances'], extras_require={ 'HTML': ['jinja2>=2.0'], - 'SENSORS': ['pysensors>=0.0.2'], + 'SENSORS': ['pysensors>=0.0.2'] }, + packages=['glances'], include_package_data=True, data_files=data_files, + test_suite="glances.tests", entry_points={"console_scripts": ["glances=glances.glances:main"]}, + classifiers=[ + 'Development Status :: 5 - Production/Stable', + 'Environment :: Console :: Curses', + 'Intended Audience :: Developers', + 'Intended Audience :: End Users/Desktop', + 'Intended Audience :: System Administrators', + 'License :: OSI Approved :: GNU Lesser General Public License v3 (LGPLv3)', + 'Operating System :: OS Independent', + 'Programming Language :: Python :: 2', + 'Programming Language :: Python :: 2.6', + 'Programming Language :: Python :: 2.7', + 'Programming Language :: Python :: 3', + 'Programming Language :: Python :: 3.2', + 'Programming Language :: Python :: 3.3' + ] )