nicolargo/glances
1
1
Fork 0
mirror of https://github.com/nicolargo/glances.git synced 2024-11-25 19:17:09 +03:00
Code Issues Projects Releases Wiki Activity

Modification pour python 3

Browse Source
This commit is contained in:
Katyucha 2015-04-07 06:41:32 +02:00
parent 553de758d5
commit 26bea1ac91
2 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
glances/core/glances_main.py
View File

@ -139,7 +139,7 @@ Start the client browser (browser mode):\n\
dest='export_influxdb', help=_('export stats to an InfluxDB server (need InfluDB lib)'))
parser.add_argument('--export-statsd', action='store_true', default=False,
dest='export_statsd', help=_('export stats to a Statsd server (need StatsD lib)'))
parser.add_argument('--export-rabbitmq', action='store_true', default=False, dest='export_rabbitmq', help=_('export stats to rabbitmq broker (need pika lib)'))
parser.add_argument('--export-rabbitmq', action='store_true', default=False, dest='export_rabbitmq', help=_('export stats to rabbitmq broker (need pika lib)'))
# Client/Server option
parser.add_argument('-c', '--client', dest='client',
help=_('connect to a Glances server by IPv4/IPv6 address or hostname'))

28
glances/exports/glances_rabbitmq.py
View File

@ -25,7 +25,7 @@ from numbers import Number
# Import Glances lib
from glances.core.glances_logging import logger
from ConfigParser import NoSectionError, NoOptionError
from configparser import NoSectionError, NoOptionError
from glances.exports.glances_export import GlancesExport
# Import pika for RabbitMQ
@ -46,7 +46,7 @@ class Export(GlancesExport):
self.rabbitmq_user = None
self.rabbitmq_password = None
self.rabbitmq_queue = None
self.hostname = socket.gethostname()
self.hostname = socket.gethostname()
self.export_enable = self.load_conf()
if not self.export_enable:
sys.exit(2)
@ -79,25 +79,23 @@ class Export(GlancesExport):
if not self.export_enable:
return None
try:
parameters = pika.URLParameters("amqp://"+self.rabbitmq_user+":"+self.rabbitmq_password+"@"+self.rabbitmq_host+":"+self.rabbitmq_port+"/")
connection = pika.BlockingConnection(parameters)
channel = connection.channel()
return channel
except Exception as e:
logger.critical("Connection to rabbitMQ failed : %s" % e)
return None
parameters = pika.URLParameters("amqp://"+self.rabbitmq_user+":"+self.rabbitmq_password+"@"+self.rabbitmq_host+":"+self.rabbitmq_port+"/")
connection = pika.BlockingConnection(parameters)
channel = connection.channel()
return channel
except Exception as e:
logger.critical("Connection to rabbitMQ failed : %s" % e)
return None
def export(self, name, columns, points):
"""Write the points in RabbitMQ"""
if self.client.is_open:
logger.error ("ouvert")
data = "hostname="+self.hostname+", name="+name+", dateinfo="+datetime.datetime.utcnow().isoformat()
for i in range(0, len(columns)):
data = "hostname="+self.hostname+", name="+name+", dateinfo="+datetime.datetime.utcnow().isoformat()
for i in range(0, len(columns)):
if not isinstance(points[i], Number):
continue
else:
else:
data += ", "+columns[i]+"="+str(points[i])
logger.debug(data)
logger.debug(data)
try:
self.client.basic_publish(exchange='', routing_key="glances_queue", body=data)
except Exception as e: