nicolargo/glances
1
1
Fork 0
mirror of https://github.com/nicolargo/glances.git synced 2024-12-01 22:14:06 +03:00
Code Issues Projects Releases Wiki Activity

Resolve merge issue

Browse Source
This commit is contained in:
Nicolargo 2015-01-22 21:52:15 +01:00
parent 6d32061754
commit 628cfcbbc5
4 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
NEWS
View File

@ -2,26 +2,22 @@
Glances Version 2.x
==============================================================================
<<<<<<< HEAD
Version 2.3
===========
=======
Version 2.2.1
=============
>>>>>>> f2096d40c3086c062f882d6f115e9dd08ae26b62
Enhancements and news features:
* Add actions on alerts (issue #132). It is now possible to run action (command line) by triggers. Action could containq {Mustache} {{tag}} (Mustache) with stat value.
* Add the Docker plugin (issue #440) with per container CPU and memory monitoring (issue #490)
* Add the RAID plugin (issue #447)
* Add actions on alerts (issue #132). It is now possible to run action (command line) by triggers. Action could contain {{tag}} (Mustache) with stat value.
* Add InfluxDB export module (--export-influxdb) (issue #455)
* Add Statsd export module (--export-statsd) (issue #465)
* Add StatsD export module (--export-statsd) (issue #465)
* Refactor export module (CSV export option is now --export-csv). It is now possible to export stats from the Glances client mode (issue #463)
* The Web inteface is now based on BootStarp / RWD grid (issue #417, #366 and #461) Thanks to Nicolas Hart @nclsHart
* Add the RAID plugin (issue #447)
* Add the Docker plugin (issue #440) with per container CPU and memory monitoring (issue #490)
* It is possible, through the configuration file, to define if an alarm should be logged or not (using the _log option) (issue #437)
* It is now possible, through the configuration file, to define if an alarm should be logged or not (using the _log option) (issue #437)
* You can now set alarm for Disk IO
* API: add getAllLimits and getAllViews methods (issue#481)
* API: add getAllLimits and getAllViews methods (issue #481) and allow CORS request (issue #479)
* SNMP client support NetApp appliance (issue #394)
Bugs corrected:

6
docs/glances-doc.rst
View File

@ -2,11 +2,11 @@
Glances
=======
This manual describes *Glances* version 2.2.1.
This manual describes *Glances* version 2.3.
Copyright © 2011-2015 Nicolas Hennion <nicolas@nicolargo.com>
Junuary 2015
January 2015
.. contents:: Table of Contents
@ -719,7 +719,7 @@ By action, we mean all shell command line. For example, if you want to execute t
critical=5.0
critical_action=python /path/to/foo.py
All the stats are usable in the command line by the use of the {{mustache}} syntax. Another example to create a log file containing used vs total disk space if a warning space trigger is reached:
All the stats are available in the command line through the use of the {{mustache}} syntax. Another example to create a log file containing used vs total disk space if a space trigger warning is reached:
[fs]
warning=70

2
glances/__init__.py
View File

@ -20,7 +20,7 @@
"""Init the Glances software."""
__appname__ = 'glances'
__version__ = '2.2.1'
__version__ = '2.3_RC1'
__author__ = 'Nicolas Hennion <nicolas@nicolargo.com>'
__license__ = 'LGPL'

4
setup.py
View File

@ -52,13 +52,13 @@ def get_requires():
setup(
name='Glances',
version='2.2.1',
version='2.3RC1',
description="A cross-platform curses-based monitoring tool",
long_description=open('README.rst').read(),
author='Nicolas Hennion',
author_email='nicolas@nicolargo.com',
url='https://github.com/nicolargo/glances',
# download_url='https://s3.amazonaws.com/glances/glances-2.2.1.tar.gz',
# download_url='https://s3.amazonaws.com/glances/glances-2.3.tar.gz',
license="LGPL",
keywords="cli curses monitoring system",
install_requires=get_requires(),