-
-
Notifications
You must be signed in to change notification settings - Fork 1.5k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
35 changed files
with
993 additions
and
698 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
.. _riemann: | ||
|
||
Riemann | ||
======== | ||
|
||
You can export statistics to an ``Riemann`` server (using TCP protocol). The | ||
connection should be defined in the Glances configuration file as | ||
following: | ||
|
||
.. code-block:: ini | ||
[riemann] | ||
host=localhost | ||
port=5555 | ||
and run Glances with: | ||
|
||
.. code-block:: console | ||
$ glances --export-riemann |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -27,13 +27,13 @@ | |
|
||
# Global name | ||
__appname__ = 'glances' | ||
__version__ = '2.6' | ||
__version__ = '2.6.1' | ||
__author__ = 'Nicolas Hennion <[email protected]>' | ||
__license__ = 'LGPL' | ||
|
||
# Import psutil | ||
try: | ||
from psutil import __version__ as __psutil_version | ||
from psutil import __version__ as psutil_version | ||
except ImportError: | ||
print('PSutil library not found. Glances cannot start.') | ||
sys.exit(1) | ||
|
@@ -62,8 +62,8 @@ | |
|
||
# Check PSutil version | ||
psutil_min_version = (2, 0, 0) | ||
psutil_version = tuple([int(num) for num in __psutil_version.split('.')]) | ||
if psutil_version < psutil_min_version: | ||
psutil_version_info = tuple([int(num) for num in psutil_version.split('.')]) | ||
if psutil_version_info < psutil_min_version: | ||
print('PSutil 2.0 or higher is needed. Glances cannot start.') | ||
sys.exit(1) | ||
|
||
|
@@ -107,7 +107,7 @@ def main(): | |
logger.info('{0} {1} and PSutil {2} detected'.format( | ||
platform.python_implementation(), | ||
platform.python_version(), | ||
__psutil_version)) | ||
psutil_version)) | ||
|
||
# Share global var | ||
global core, standalone, client, server, webserver | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2,7 +2,7 @@ | |
# | ||
# This file is part of Glances. | ||
# | ||
# Copyright (C) 2015 Nicolargo <[email protected]> | ||
# Copyright (C) 2016 Nicolargo <[email protected]> | ||
# | ||
# Glances is free software; you can redistribute it and/or modify | ||
# it under the terms of the GNU Lesser General Public License as published by | ||
|
@@ -28,7 +28,7 @@ | |
from glances.logger import logger | ||
from glances.password_list import GlancesPasswordList as GlancesPassword | ||
from glances.static_list import GlancesStaticServer | ||
from glances.outputs.glances_curses import GlancesCursesBrowser | ||
from glances.outputs.glances_curses_browser import GlancesCursesBrowser | ||
|
||
|
||
class GlancesClientBrowser(object): | ||
|
@@ -160,7 +160,7 @@ def __serve_forever(self): | |
"Server list dictionnary change inside the loop (wait next update)") | ||
|
||
# Update the screen (list or Glances client) | ||
if not self.screen.active_server: | ||
if self.screen.active_server is None: | ||
# Display the Glances browser | ||
self.screen.update(self.get_servers_list()) | ||
else: | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.