diff options
| -rw-r--r-- | NEWS | 7 | ||||
| -rw-r--r-- | README.rst | 2 | ||||
| -rw-r--r-- | docs/man/glances.1 | 2 | ||||
| -rw-r--r-- | glances/__init__.py | 2 | ||||
| -rw-r--r-- | glances/plugins/glances_uptime.py | 4 | ||||
| -rw-r--r-- | optional-requirements.txt | 2 | ||||
| -rwxr-xr-x | setup.py | 2 |
7 files changed, 14 insertions, 7 deletions
@@ -2,6 +2,13 @@ Glances Version 2 ============================================================================== +Version 2.8.2 +============= + +Bugs corrected: + + * InfluxDB export in 2.8.1 is broken (issue #1026) + Version 2.8.1 ============= @@ -61,7 +61,7 @@ Optional dependencies: - ``influxdb`` (for the InfluxDB export module) - ``matplotlib`` (for graphical/chart support) - ``netifaces`` (for the IP plugin) -- ``nvidia-ml-py`` (for the GPU plugin) +- ``nvidia-ml-py`` (for the GPU plugin) [Python 2-only] - ``pika`` (for the RabbitMQ/ActiveMQ export module) - ``potsdb`` (for the OpenTSDB export module) - ``py3sensors`` (for hardware monitoring support) [Linux-only] diff --git a/docs/man/glances.1 b/docs/man/glances.1 index 1e5f583d..aa8355e4 100644 --- a/docs/man/glances.1 +++ b/docs/man/glances.1 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "GLANCES" "1" "Feb 06, 2017" "2.8.1" "Glances" +.TH "GLANCES" "1" "Feb 07, 2017" "2.8.2" "Glances" .SH NAME glances \- An eye on your system . diff --git a/glances/__init__.py b/glances/__init__.py index d0a7f8cf..ac0d515a 100644 --- a/glances/__init__.py +++ b/glances/__init__.py @@ -27,7 +27,7 @@ import signal import sys # Global name -__version__ = '2.8.1' +__version__ = '2.8.2' __author__ = 'Nicolas Hennion <nicolas@nicolargo.com>' __license__ = 'LGPLv3' diff --git a/glances/plugins/glances_uptime.py b/glances/plugins/glances_uptime.py index c72ba90e..8678ebb3 100644 --- a/glances/plugins/glances_uptime.py +++ b/glances/plugins/glances_uptime.py @@ -47,7 +47,7 @@ class Plugin(GlancesPlugin): self.align = 'right' # Init the stats - self.uptime = datetime.now() + self.uptime = datetime.now() - datetime.fromtimestamp(psutil.boot_time()) self.reset() def reset(self): @@ -59,7 +59,7 @@ class Plugin(GlancesPlugin): Export uptime in seconds. """ - return {'seconds': self.uptime.second} + return {'seconds': self.uptime.seconds} @GlancesPlugin._check_decorator @GlancesPlugin._log_result_decorator diff --git a/optional-requirements.txt b/optional-requirements.txt index 926c046a..869343a7 100644 --- a/optional-requirements.txt +++ b/optional-requirements.txt @@ -8,7 +8,7 @@ elasticsearch influxdb matplotlib netifaces -nvidia-ml-py +nvidia-ml-py; python_version == "2.7" pika potsdb py-cpuinfo @@ -87,7 +87,7 @@ setup( 'export': ['bernhard', 'cassandra-driver', 'couchdb', 'elasticsearch', 'influxdb>=1.0.0', 'pika', 'potsdb', 'pyzmq', 'statsd'], 'folders:python_version<"3.5"': ['scandir'], - 'gpu': ['nvidia-ml-py'], + 'gpu:python_version=="2.7"': ['nvidia-ml-py'], 'ip': ['netifaces'], 'raid': ['pymdstat'], 'snmp': ['pysnmp'], |