Commit Graph

1830 Commits

Author SHA1 Message Date
Nicolas Hart
ff4c3d3613 fix merge issue 2015-04-20 22:41:29 +02:00
Alessio Sergi
19e49f4b86 glances_client.py: fix function call 2015-04-19 23:54:02 +02:00
Nicolas Hart
9b0de83793 add ip plugin on web ui 2015-04-19 23:22:29 +02:00
Nicolas Hart
92aececa37 fix issue from previous merge 2015-04-19 23:04:56 +02:00
Nicolas Hart
518aa7acfe Merge branch 'develop' into refactor-web-ui
Conflicts:
	glances/plugins/glances_help.py
2015-04-19 23:01:32 +02:00
Nicolas Hart
7792f9d99b refactor the stats template using one file per plugins 2015-04-19 22:48:52 +02:00
nicolargo
07f73ddeb6 Correct another UTF-8 issue 2015-04-19 16:52:51 +02:00
nicolargo
4865b6c03f Use enumerate 2015-04-19 15:41:31 +02:00
Alessio Sergi
904eacebe7 README.rst: fix some typos 2015-04-19 12:45:55 +02:00
Alessio Sergi
4f2e051b05 Add sort processes by USER 2015-04-19 11:49:19 +02:00
nicolargo
3d89e34c21 Correct raise issue on Mac OS X 2/2 2015-04-18 17:48:17 +02:00
nicolargo
04378ec156 Correct raise issue on Mac OS X 2015-04-18 17:45:57 +02:00
nicolargo
3717c2fcf9 Add comment for the Docker network stats issue 2015-04-18 16:24:54 +02:00
nicolargo
0d6751b33e Merge branch 'develop' of https://github.com/nicolargo/glances into develop 2015-04-18 15:53:28 +02:00
nicolargo
cfdb0841df Change the Docker plugin to use the new CPU stats as default method 2015-04-18 15:53:01 +02:00
Alessio Sergi
f54a32f07b glances-doc.html: update to reflect recent changes 2015-04-16 16:46:16 +02:00
Alessio Sergi
1d509f471e glances-doc.rst: wrap source lines to 72 characters (where possible)
- Fix various typos and misspelling
- TOC improvements
2015-04-16 16:36:16 +02:00
Alessio Sergi
4d07670c8d glances-doc.rst: fix broken target name 2015-04-16 15:38:16 +02:00
Alessio Sergi
4318361517 No more system-wide configuration file by default
Support remains there, but no system-wide configuration file will be
provided anymore.

Default configuration settings are initialized by code which may be
overridden by a configuration file.
2015-04-16 15:28:52 +02:00
Alessio Sergi
9a87924596 NEWS: spelling: s/news/new/g 2015-04-13 15:34:37 +02:00
nicolargo
e288c01ebf Update NEWS file 2015-04-12 22:15:23 +02:00
nicolargo
49a579d6d1 Correct some PEP on the brand new RabbitMQ export module 2015-04-12 21:40:46 +02:00
Nicolas Hennion
e0205a9e4a Merge pull request #540 from Katyucha/develop
RabbitMQ export (3rd try)

Thk for the contrib !
2015-04-12 21:09:05 +02:00
Katyucha
3b8785968c RabbitMQ export : delete debug info 2015-04-07 20:43:47 +02:00
Katyucha
5c0403a05e Update for Pika Python3 2015-04-07 20:40:08 +02:00
Katyucha
281050a1a2 Merge branch 'develop' of github.com:Katyucha/glances into develop 2015-04-07 20:30:45 +02:00
Katyucha
36c2f7d8c9 Update for python3. Need package python3-pika 2015-04-07 20:29:03 +02:00
Katyucha
bcc7e49b52 Update glances_rabbitmq.py 2015-04-07 18:24:21 +02:00
Katyucha
26bea1ac91 Modification pour python 3 2015-04-07 06:41:32 +02:00
Katyucha
553de758d5 Add RabbitMQ export for glances 2015-04-06 22:03:11 +02:00
root
8a3c2e29bf RabbitMQ export from Sylvain Luce / Katyucha 2015-04-06 21:54:46 +02:00
nicolargo
9895661076 If the Curses application raises an exception, restore the terminal correctly (issue #537) 2015-04-05 10:27:43 +02:00
Nicolas Hennion
08894ab116 Merge pull request #536 from nclsHart/docker
[Web UI] Display the Docker plugin only if there is a running container
2015-04-04 18:52:42 +02:00
Nicolas Hart
56f8340950 show docker plugin only if there is a running container 2015-04-04 18:21:32 +02:00
Nicolas Hart
96365ff319 Merge branch 'develop' into feature/issue480 2015-04-04 18:17:32 +02:00
Nicolas Hennion
9a401c5c71 Merge pull request #535 from nclsHart/docker
Add docker plugin on angularjs web ui
2015-04-04 15:37:01 +02:00
nicolargo
b4ce3c7fae Correct server mode issue when no network interface is available (issue #528) 2015-04-04 15:35:47 +02:00
nicolargo
5464948acc Some code refactoring 2015-04-03 22:03:37 +02:00
Nicolas Hart
8afba92167 Merge branch 'feature/issue480' into docker 2015-04-02 01:23:04 +02:00
Nicolas Hart
c9941ea0ea Merge branch 'develop' into feature/issue480 2015-04-02 01:22:50 +02:00
Nicolas Hart
200df6ab5c add docker plugin 2015-04-02 01:21:39 +02:00
nicolargo
c1712d1995 Change documentation - Add color keyword (issue #527) 2015-04-01 22:10:18 +02:00
nicolargo
3a7856831c Avoid crach on olds kernels (issue #554) 2015-04-01 22:00:13 +02:00
nicolargo
71ffcef3d0 Add system and uptime to the export module 2015-03-31 22:38:27 +02:00
nicolargo
13df3493d0 Correct an issue on quiet mode, refresh time is not take into account 2015-03-31 22:25:55 +02:00
nicolargo
2f2b84b6bd Add percpu to export module 2015-03-31 22:07:05 +02:00
Nicolas Hennion
460abad493 Merge pull request #532 from nclsHart/feature/issue480
Sync feature/issue480 with develop
2015-03-31 09:01:25 +02:00
Nicolas Hart
ac3d68e393 Merge branch 'develop' into feature/issue480 2015-03-30 22:28:22 +02:00
nicolargo
781d12235b Change log level for InfluxDB 0.8 fallback 2015-03-28 13:55:09 +01:00
nicolargo
0833c44140 Remove not necessary log message 2015-03-28 13:42:54 +01:00