mirror of https://github.com/nicolargo/glances.git
Fix some doc and comments
Add riemann to the index, otherwise it doesn't exist.
This commit is contained in:
parent
ee471b9dd7
commit
8c5b74ed6a
|
|
@ -295,7 +295,7 @@ Gateway to other services
|
|||
=========================
|
||||
|
||||
Glances can export stats to: ``CSV`` file, ``InfluxDB``, ``OpenTSDB``,
|
||||
``StatsD``, ``RabbitMQ`` and ``Riemann`` server.
|
||||
``StatsD``, ``ElasticSearch``, ``RabbitMQ`` and ``Riemann`` server.
|
||||
|
||||
How to contribute ?
|
||||
===================
|
||||
|
|
|
|||
|
|
@ -218,14 +218,14 @@ port=4242
|
|||
#tags=foo:bar,spam:eggs
|
||||
|
||||
[statsd]
|
||||
# Configuration file the --export-statsd option
|
||||
# Configuration for the --export-statsd option
|
||||
# https://github.com/etsy/statsd
|
||||
host=localhost
|
||||
port=8125
|
||||
#prefix=glances
|
||||
|
||||
[elasticsearch]
|
||||
# Configuration file the --export-elasticsearch option
|
||||
# Configuration for the --export-elasticsearch option
|
||||
# Data are available via the ES Restful API. ex: URL/<index>/cpu/system
|
||||
# https://www.elastic.co
|
||||
host=localhost
|
||||
|
|
@ -233,7 +233,7 @@ port=9200
|
|||
index=glances
|
||||
|
||||
[riemann]
|
||||
# Configuration file for the --export-riemann option
|
||||
# Configuration for the --export-riemann option
|
||||
# http://riemann.io
|
||||
host=localhost
|
||||
port=5555
|
||||
|
|
|
|||
|
|
@ -8,7 +8,8 @@ monitor size of a predefined folders list.
|
|||
|
||||
.. image:: ../_static/folders.png
|
||||
|
||||
If the size can not be computed, a '?' (non existing folder) or a '!' (read right error) is displayed.
|
||||
If the size cannot be computed, a ``'?'`` (non-existing folder) or a
|
||||
``'!'`` (permission denied) is displayed.
|
||||
|
||||
Each item is defined by:
|
||||
|
||||
|
|
|
|||
|
|
@ -15,3 +15,4 @@ to providing stats to multiple services.
|
|||
statsd
|
||||
rabbitmq
|
||||
elastic
|
||||
riemann
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
.. _riemann:
|
||||
|
||||
Riemann
|
||||
========
|
||||
=======
|
||||
|
||||
You can export statistics to an ``Riemann`` server (using TCP protocol). The
|
||||
connection should be defined in the Glances configuration file as
|
||||
You can export statistics to a ``Riemann`` server (using TCP protocol).
|
||||
The connection should be defined in the Glances configuration file as
|
||||
following:
|
||||
|
||||
.. code-block:: ini
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ from glances.compat import NoOptionError, NoSectionError, range
|
|||
from glances.logger import logger
|
||||
from glances.exports.glances_export import GlancesExport
|
||||
|
||||
# Import pika for Riemann
|
||||
# Import bernhard for Riemann
|
||||
import bernhard
|
||||
|
||||
|
||||
|
|
@ -39,7 +39,7 @@ class Export(GlancesExport):
|
|||
"""Init the Riemann export IF."""
|
||||
super(Export, self).__init__(config=config, args=args)
|
||||
|
||||
# Load the rabbitMQ configuration file
|
||||
# Load the Riemann configuration
|
||||
self.riemann_host = None
|
||||
self.riemann_port = None
|
||||
self.hostname = socket.gethostname()
|
||||
|
|
@ -47,7 +47,7 @@ class Export(GlancesExport):
|
|||
if not self.export_enable:
|
||||
sys.exit(2)
|
||||
|
||||
# Init the rabbitmq client
|
||||
# Init the Riemann client
|
||||
self.client = self.init()
|
||||
|
||||
def load_conf(self, section="riemann"):
|
||||
|
|
@ -89,4 +89,4 @@ class Export(GlancesExport):
|
|||
try:
|
||||
self.client.send(data)
|
||||
except Exception as e:
|
||||
logger.error("Can not export stats to Riemann (%s)" % e)
|
||||
logger.error("Cannot export stats to Riemann (%s)" % e)
|
||||
|
|
|
|||
Loading…
Reference in New Issue