Update for python3. Need package python3-pika

liuweihere · Apr 7, 2015 · 36c2f7d · 36c2f7d
1 parent 26bea1a
commit 36c2f7d
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 3 deletions.
diff --git a/docs/glances-doc.rst b/docs/glances-doc.rst
@@ -159,6 +159,8 @@ Command-Line Options
                         export stats to an InfluxDB server
   --export-statsd
                         export stats to a Statsd server
+  --export-rabbitmq
+                        export stats to a RabbitMQ server
   -c CLIENT, --client CLIENT
                         connect to a Glances server by IPv4/IPv6 address or
                         hostname
@@ -824,6 +826,25 @@ Glances will generate stats as:
     'glances.load.min1': 0.19,
     ...
 
+*RabbitMQ*
+
+You can export statistics to an RabbitMQ server (AMQP Broker). The connection should be defined in the Glances configuration file as following:
+
+.. code-block::
+
+    [rabbitmq]
+    host=localhost
+    port=5672
+    user=glances
+    password=glances
+    queue=glances_queue
+
+and run Glances with:
+
+.. code-block:: console
+
+    $ glances --export-rabbitmq
+
 
 APIs Documentations
 ===================

diff --git a/glances/exports/glances_rabbitmq.py b/glances/exports/glances_rabbitmq.py
@@ -25,7 +25,10 @@
 
 # Import Glances lib
 from glances.core.glances_logging import logger
-from configparser import NoSectionError, NoOptionError
+try:
+    from configparser import NoOptionError, NoSectionError
+except ImportError:  # Python 2
+    from ConfigParser import NoOptionError, NoSectionError
 from glances.exports.glances_export import GlancesExport
 
 # Import pika for RabbitMQ
@@ -78,13 +81,14 @@ def init(self):
         """Init the connection to the rabbitmq server"""
         if not self.export_enable:
             return None
+        sparameters = "amqp://"+self.rabbitmq_user+":"+self.rabbitmq_password+"@"+self.rabbitmq_host+":"+self.rabbitmq_port+"/"
         try: 
-                parameters = pika.URLParameters("amqp://"+self.rabbitmq_user+":"+self.rabbitmq_password+"@"+self.rabbitmq_host+":"+self.rabbitmq_port+"/")
+                parameters = pika.URLParameters(sparameters)
                 connection = pika.BlockingConnection(parameters)
                 channel = connection.channel()
                 return channel
         except Exception as e:
-                logger.critical("Connection to rabbitMQ failed : %s" % e)
+                logger.critical("Connection to rabbitMQ failed : %s " % e)
                 return None
 
     def export(self, name, columns, points):

diff --git a/man/glances.1 b/man/glances.1
@@ -80,6 +80,9 @@ export stats to an InfluxDB server
 .B \-\-export-statsd
 export stats to a Statsd server
 .TP
+.B \-\-export-rabbitmq
+export stats to a RabbitMQ server
+.TP
 .B \-s, \-\-server
 run Glances in server mode
 .TP
@@ -234,6 +237,9 @@ Monitor local machine and export stats to a CSV file (standalone mode):
 Monitor local machine and export stats to a InfluxDB server with 5s refresh time (standalone mode):
 .B $ glances -t 5 --export-influxdb
 .PP
+Monitor local machine and export stats to a RabbitMQ server with 5s refresh time (standalone mode):
+.B $ glances -t 5 --export-rabbitmq
+.PP
 Start a Glances server (server mode):
 .B $ glances -s
 .PP