diff options
| author | nicolargo <nicolashennion@gmail.com> | 2016-03-16 17:42:09 +0100 |
|---|---|---|
| committer | nicolargo <nicolashennion@gmail.com> | 2016-03-16 17:42:09 +0100 |
| commit | adb900d4b02da07006fdcc9ecb3266b93018521f (patch) | |
| tree | f1da58b5dde6692affbb781d025556efc6e7f1a5 | |
| parent | bcff18231d0c6866af85a654f2af6f2251601af9 (diff) | |
| parent | 278add2bcfe77d6d1bf89c8ad9ddf2c0e690f41d (diff) | |
Merge branch 'develop'v2.6
| -rw-r--r-- | .travis.yml | 5 | ||||
| -rw-r--r-- | AUTHORS | 6 | ||||
| -rw-r--r-- | CONTRIBUTING.md | 4 | ||||
| -rw-r--r-- | Dockerfile | 24 | ||||
| -rw-r--r-- | MANIFEST.in | 15 | ||||
| -rw-r--r-- | NEWS | 55 | ||||
| -rw-r--r-- | README.rst | 50 | ||||
| -rw-r--r-- | conf/glances-grafana.json | 2462 | ||||
| -rw-r--r-- | conf/glances.conf | 63 | ||||
| -rw-r--r-- | docs/Makefile | 72 | ||||
| -rw-r--r-- | docs/README.txt | 22 | ||||
| -rw-r--r-- | docs/_static/connected.png (renamed from docs/images/connected.png) | bin | 9442 -> 9442 bytes | |||
| -rw-r--r-- | docs/_static/cpu-wide.png (renamed from docs/images/cpu-wide.png) | bin | 15160 -> 15160 bytes | |||
| -rw-r--r-- | docs/_static/cpu.png (renamed from docs/images/cpu.png) | bin | 7519 -> 7519 bytes | |||
| -rw-r--r-- | docs/_static/disconnected.png (renamed from docs/images/disconnected.png) | bin | 10031 -> 10031 bytes | |||
| -rw-r--r-- | docs/_static/diskio.png (renamed from docs/images/diskio.png) | bin | 9638 -> 9638 bytes | |||
| -rw-r--r-- | docs/_static/docker.png (renamed from docs/images/docker.png) | bin | 38418 -> 38418 bytes | |||
| -rw-r--r-- | docs/_static/folders.png | bin | 0 -> 13715 bytes | |||
| -rw-r--r-- | docs/_static/fs.png (renamed from docs/images/fs.png) | bin | 10950 -> 10950 bytes | |||
| -rw-r--r-- | docs/_static/glances-responsive-webdesign.png (renamed from docs/images/glances-responsive-webdesign.png) | bin | 293649 -> 293649 bytes | |||
| -rw-r--r-- | docs/_static/grafana.png | bin | 0 -> 163623 bytes | |||
| -rw-r--r-- | docs/_static/header.png (renamed from docs/images/header.png) | bin | 9187 -> 9187 bytes | |||
| -rw-r--r-- | docs/_static/load.png (renamed from docs/images/load.png) | bin | 6923 -> 6923 bytes | |||
| -rw-r--r-- | docs/_static/logs.png (renamed from docs/images/logs.png) | bin | 24808 -> 24808 bytes | |||
| -rw-r--r-- | docs/_static/mem-wide.png (renamed from docs/images/mem-wide.png) | bin | 23457 -> 23457 bytes | |||
| -rw-r--r-- | docs/_static/mem.png (renamed from docs/images/mem.png) | bin | 13587 -> 13587 bytes | |||
| -rw-r--r-- | docs/_static/monitored.png (renamed from docs/images/monitored.png) | bin | 12190 -> 12190 bytes | |||
| -rw-r--r-- | docs/_static/network.png (renamed from docs/images/network.png) | bin | 10211 -> 10211 bytes | |||
| -rw-r--r-- | docs/_static/per-cpu.png (renamed from docs/images/per-cpu.png) | bin | 21132 -> 21132 bytes | |||
| -rw-r--r-- | docs/_static/processlist-filter.png (renamed from docs/images/processlist-filter.png) | bin | 84667 -> 84667 bytes | |||
| -rw-r--r-- | docs/_static/processlist-top.png (renamed from docs/images/processlist-top.png) | bin | 53684 -> 53684 bytes | |||
| -rw-r--r-- | docs/_static/processlist-wide.png (renamed from docs/images/processlist-wide.png) | bin | 227401 -> 227401 bytes | |||
| -rw-r--r-- | docs/_static/processlist.png (renamed from docs/images/processlist.png) | bin | 151590 -> 151590 bytes | |||
| -rw-r--r-- | docs/_static/quicklook-percpu.png (renamed from docs/images/quicklook-percpu.png) | bin | 27582 -> 27582 bytes | |||
| -rw-r--r-- | docs/_static/quicklook.png (renamed from docs/images/quicklook.png) | bin | 17789 -> 17789 bytes | |||
| -rw-r--r-- | docs/_static/raid.png (renamed from docs/images/raid.png) | bin | 5585 -> 5585 bytes | |||
| -rw-r--r-- | docs/_static/screenshot-web.png | bin | 0 -> 265567 bytes | |||
| -rw-r--r-- | docs/_static/screenshot-web2.png | bin | 0 -> 36097 bytes | |||
| -rw-r--r-- | docs/_static/screenshot-wide.png | bin | 0 -> 608055 bytes | |||
| -rw-r--r-- | docs/_static/screenshot.png (renamed from docs/images/screenshot.png) | bin | 508044 -> 508044 bytes | |||
| -rw-r--r-- | docs/_static/sensors.png (renamed from docs/images/sensors.png) | bin | 16125 -> 16125 bytes | |||
| -rw-r--r-- | docs/_templates/links.html | 7 | ||||
| -rw-r--r-- | docs/aoa/actions.rst | 34 | ||||
| -rw-r--r-- | docs/aoa/cpu.rst | 41 | ||||
| -rw-r--r-- | docs/aoa/disk.rst | 26 | ||||
| -rw-r--r-- | docs/aoa/docker.rst | 11 | ||||
| -rw-r--r-- | docs/aoa/folders.rst | 34 | ||||
| -rw-r--r-- | docs/aoa/fs.rst | 55 | ||||
| -rw-r--r-- | docs/aoa/header.rst | 20 | ||||
| -rw-r--r-- | docs/aoa/index.rst | 37 | ||||
| -rw-r--r-- | docs/aoa/load.rst | 35 | ||||
| -rw-r--r-- | docs/aoa/logs.rst | 21 | ||||
| -rw-r--r-- | docs/aoa/memory.rst | 30 | ||||
| -rw-r--r-- | docs/aoa/monitor.rst | 65 | ||||
| -rw-r--r-- | docs/aoa/network.rst | 28 | ||||
| -rw-r--r-- | docs/aoa/ps.rst | 107 | ||||
| -rw-r--r-- | docs/aoa/quicklook.rst | 17 | ||||
| -rw-r--r-- | docs/aoa/sensors.rst | 24 | ||||
| -rw-r--r-- | docs/api.rst | 15 | ||||
| -rw-r--r-- | docs/cmds.rst | 413 | ||||
| -rw-r--r-- | docs/conf.py | 140 | ||||
| -rw-r--r-- | docs/config.rst | 77 | ||||
| -rw-r--r-- | docs/glances-doc.html | 1066 | ||||
| -rw-r--r-- | docs/glances-doc.rst | 964 | ||||
| -rw-r--r-- | docs/glances.rst | 68 | ||||
| -rw-r--r-- | docs/gw/csv.rst | 15 | ||||
| -rw-r--r-- | docs/gw/elastic.rst | 38 | ||||
| -rw-r--r-- | docs/gw/index.rst | 17 | ||||
| -rw-r--r-- | docs/gw/influxdb.rst | 46 | ||||
| -rw-r--r-- | docs/gw/opentsdb.rst | 22 | ||||
| -rw-r--r-- | docs/gw/rabbitmq.rst | 23 | ||||
| -rw-r--r-- | docs/gw/statsd.rst | 33 | ||||
| -rw-r--r-- | docs/images/grafana.png | bin | 202873 -> 0 bytes | |||
| -rw-r--r-- | docs/images/screenshot-web.png | bin | 293155 -> 0 bytes | |||
| -rw-r--r-- | docs/images/screenshot-web2.png | bin | 164736 -> 0 bytes | |||
| -rw-r--r-- | docs/images/screenshot-wide.png | bin | 636915 -> 0 bytes | |||
| -rw-r--r-- | docs/index.rst | 40 | ||||
| -rw-r--r-- | docs/init_script | 131 | ||||
| -rw-r--r-- | docs/make.bat | 263 | ||||
| -rw-r--r-- | docs/man/glances.1 | 588 | ||||
| -rw-r--r-- | docs/quickstart.rst | 120 | ||||
| -rw-r--r-- | docs/style.css | 109 | ||||
| -rw-r--r-- | docs/support.rst | 13 | ||||
| -rw-r--r-- | glances/README.txt | 52 | ||||
| -rw-r--r-- | glances/__init__.py | 34 | ||||
| -rw-r--r-- | glances/__main__.py | 4 | ||||
| -rw-r--r-- | glances/actions.py (renamed from glances/core/glances_actions.py) | 16 | ||||
| -rw-r--r-- | glances/autodiscover.py (renamed from glances/core/glances_autodiscover.py) | 12 | ||||
| -rw-r--r-- | glances/client.py (renamed from glances/core/glances_client.py) | 29 | ||||
| -rw-r--r-- | glances/client_browser.py (renamed from glances/core/glances_client_browser.py) | 31 | ||||
| -rw-r--r-- | glances/compat.py | 127 | ||||
| -rw-r--r-- | glances/config.py (renamed from glances/core/glances_config.py) | 39 | ||||
| -rw-r--r-- | glances/core/__init__.py | 0 | ||||
| -rw-r--r-- | glances/cpu_percent.py (renamed from glances/core/glances_cpu_percent.py) | 2 | ||||
| -rw-r--r-- | glances/exports/glances_csv.py | 26 | ||||
| -rw-r--r-- | glances/exports/glances_elasticsearch.py | 117 | ||||
| -rw-r--r-- | glances/exports/glances_export.py | 40 | ||||
| -rw-r--r-- | glances/exports/glances_history.py | 11 | ||||
| -rw-r--r-- | glances/exports/glances_influxdb.py | 41 | ||||
| -rw-r--r-- | glances/exports/glances_opentsdb.py | 25 | ||||
| -rw-r--r-- | glances/exports/glances_rabbitmq.py | 13 | ||||
| -rw-r--r-- | glances/exports/glances_statsd.py | 13 | ||||
| -rw-r--r-- | glances/folder_list.py | 192 | ||||
| -rw-r--r-- | glances/globals.py (renamed from glances/core/glances_globals.py) | 23 | ||||
| -rw-r--r-- | glances/logger.py (renamed from glances/core/glances_logging.py) | 22 | ||||
| -rw-r--r-- | glances/logs.py (renamed from glances/core/glances_logs.py) | 5 | ||||
| -rw-r--r-- | glances/main.py (renamed from glances/core/glances_main.py) | 106 | ||||
| -rw-r--r-- | glances/monitor_list.py (renamed from glances/core/glances_monitor_list.py) | 31 | ||||
| -rw-r--r-- | glances/outputs/glances_bars.py | 10 | ||||
| -rw-r--r-- | glances/outputs/glances_bottle.py | 61 | ||||
| -rw-r--r-- | glances/outputs/glances_colorconsole.py | 10 | ||||
| -rw-r--r-- | glances/outputs/glances_curses.py | 258 | ||||
| -rw-r--r-- | glances/outputs/static/css/style.css | 3 | ||||
| -rw-r--r-- | glances/outputs/static/html/help.html | 16 | ||||
| -rw-r--r-- | glances/outputs/static/html/index.html | 10 | ||||
| -rw-r--r-- | glances/outputs/static/html/plugins/diskio.html | 16 | ||||
| -rw-r--r-- | glances/outputs/static/html/plugins/folders.html | 8 | ||||
| -rw-r--r-- | glances/outputs/static/html/plugins/fs.html | 10 | ||||
| -rw-r--r-- | glances/outputs/static/html/plugins/network.html | 32 | ||||
| -rw-r--r-- | glances/outputs/static/html/plugins/processlist.html | 12 | ||||
| -rw-r--r-- | glances/outputs/static/html/plugins/quicklook.html | 4 | ||||
| -rw-r--r-- | glances/outputs/static/html/stats.html | 43 | ||||
| -rw-r--r-- | glances/outputs/static/js/app.js | 25 | ||||
| -rw-r--r-- | glances/outputs/static/js/directives.js | 2 | ||||
| -rw-r--r-- | glances/outputs/static/js/services/core/glances_stats.js | 6 | ||||
| -rw-r--r-- | glances/outputs/static/js/services/plugins/glances_alert.js | 9 | ||||
| -rw-r--r-- | glances/outputs/static/js/services/plugins/glances_diskio.js | 14 | ||||
| -rw-r--r-- | glances/outputs/static/js/services/plugins/glances_folders.js | 30 | ||||
| -rw-r--r-- | glances/outputs/static/js/services/plugins/glances_processcount.js | 10 | ||||
| -rw-r--r-- | glances/outputs/static/js/services/plugins/glances_processlist.js | 10 | ||||
| -rw-r--r-- | glances/outputs/static/js/stats_controller.js | 132 | ||||
| -rw-r--r-- | glances/outputs/static/js/variables.js | 2 | ||||
| -rw-r--r-- | glances/outputs/static/js/vendors/angular-route.js | 991 | ||||
| -rw-r--r-- | glances/outputs/static/js/vendors/angular-route.min.js | 15 | ||||
| -rw-r--r-- | glances/outputs/static/js/vendors/angular-route.min.js.map | 8 | ||||
| -rw-r--r-- | glances/outputs/static/js/vendors/angular.js | 29657 | ||||
| -rw-r--r-- | glances/outputs/static/js/vendors/angular.min.js | 218 | ||||
| -rw-r--r-- | glances/outputs/static/js/vendors/angular.min.js.map | 8 | ||||
| -rw-r--r-- | glances/outputs/static/js/vendors/lodash.js | 12352 | ||||
| -rw-r--r-- | glances/outputs/static/js/vendors/lodash.min.js | 137 | ||||
| -rw-r--r-- | glances/password.py (renamed from glances/core/glances_password.py) | 37 | ||||
| -rw-r--r-- | glances/password_list.py (renamed from glances/core/glances_passwordlist.py) | 7 | ||||
| -rw-r--r-- | glances/plugins/glances_alert.py | 8 | ||||
| -rw-r--r-- | glances/plugins/glances_batpercent.py | 5 | ||||
| -rw-r--r-- | glances/plugins/glances_core.py | 2 | ||||
| -rw-r--r-- | glances/plugins/glances_cpu.py | 10 | ||||
| -rw-r--r-- | glances/plugins/glances_diskio.py | 86 |
