diff options
Diffstat (limited to 'glances/exports/glances_riemann/__init__.py')
| -rw-r--r-- | glances/exports/glances_riemann/__init__.py | 29 |
1 files changed, 13 insertions, 16 deletions
diff --git a/glances/exports/glances_riemann/__init__.py b/glances/exports/glances_riemann/__init__.py index 78c39eca..c90d74c0 100644 --- a/glances/exports/glances_riemann/__init__.py +++ b/glances/exports/glances_riemann/__init__.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # # This file is part of Glances. # @@ -12,20 +11,19 @@ import socket from numbers import Number -from glances.logger import logger -from glances.exports.export import GlancesExport - # Import bernhard for Riemann import bernhard +from glances.exports.export import GlancesExport +from glances.logger import logger + class Export(GlancesExport): - """This class manages the Riemann export module.""" def __init__(self, config=None, args=None): """Init the Riemann export IF.""" - super(Export, self).__init__(config=config, args=args) + super().__init__(config=config, args=args) # Mandatory configuration keys (additional to host and port) # N/A @@ -49,10 +47,9 @@ class Export(GlancesExport): if not self.export_enable: return None try: - client = bernhard.Client(host=self.host, port=self.port) - return client + return bernhard.Client(host=self.host, port=self.port) except Exception as e: - logger.critical("Connection to Riemann failed : %s " % e) + logger.critical(f"Connection to Riemann failed : {e} ") return None def export(self, name, columns, points): @@ -60,10 +57,10 @@ class Export(GlancesExport): for i in range(len(columns)): if not isinstance(points[i], Number): continue - else: - data = {'host': self.hostname, 'service': name + " " + columns[i], 'metric': points[i]} - logger.debug(data) - try: - self.client.send(data) - except Exception as e: - logger.error("Cannot export stats to Riemann (%s)" % e) + + data = {'host': self.hostname, 'service': name + " " + columns[i], 'metric': points[i]} + logger.debug(data) + try: + self.client.send(data) + except Exception as e: + logger.error(f"Cannot export stats to Riemann ({e})") |