RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-22 10:37:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

mgr/influx: PEP-8 fixes to InfluxDB module

Browse Source 
The code now scores:

  Your code has been rated at 8.94/10

Various indentation fixes, whitespaces and other PEP-8 related changes

Signed-off-by: Wido den Hollander <wido@42on.com>
This commit is contained in:
Wido den Hollander 2017-11-29 08:18:35 +01:00
parent 38f051c22a
commit 9440be3da2
No known key found for this signature in database
GPG Key ID: 019B582DDB3ECA42
1 changed files with 27 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/pybind/mgr/influx/module.py
View File

@ -1,4 +1,3 @@
from datetime import datetime
from threading import Event
import json
@ -12,6 +11,7 @@ try:
except ImportError:
InfluxDBClient = None
class Module(MgrModule):
COMMANDS = [
{
@ -21,20 +21,17 @@ class Module(MgrModule):
},
]
def __init__(self, *args, **kwargs):
super(Module, self).__init__(*args, **kwargs)
self.event = Event()
self.run = True
def get_latest(self, daemon_type, daemon_name, stat):
data = self.get_counter(daemon_type, daemon_name, stat)[stat]
if data:
return data[-1][1]
else:
return 0
return 0
def get_df_stats(self):
df = self.get("df")
@ -55,15 +52,15 @@ class Module(MgrModule):
point = {
"measurement": "ceph_pool_stats",
"tags": {
"pool_name" : pool['name'],
"pool_id" : pool['id'],
"type_instance" : df_type,
"mgr_id" : self.get_mgr_id(),
"pool_name": pool['name'],
"pool_id": pool['id'],
"type_instance": df_type,
"mgr_id": self.get_mgr_id(),
},
"time" : datetime.utcnow().isoformat() + 'Z',
"fields": {
"value" : pool['stats'][df_type],
}
"time": datetime.utcnow().isoformat() + 'Z',
"fields": {
"value": pool['stats'][df_type],
}
}
data.append(point)
return data
@ -113,13 +110,18 @@ class Module(MgrModule):
client = InfluxDBClient(host, port, username, password, database)
# using influx client get_list_database requires admin privs, instead we'll catch the not found exception and inform the user if db can't be created
# using influx client get_list_database requires admin privs,
# instead we'll catch the not found exception and inform the user if
# db can not be created
try:
client.write_points(self.get_df_stats(), 'ms')
client.write_points(self.get_daemon_stats(), 'ms')
except InfluxDBClientError as e:
if e.code == 404:
self.log.info("Database '{0}' not found, trying to create (requires admin privs). You can also create manually and grant write privs to user '{1}'".format(database,username))
self.log.info("Database '%s' not found, trying to create "
"(requires admin privs). You can also create "
"manually and grant write privs to user "
"'%s'", database, username)
client.create_database(database)
else:
raise
@ -134,14 +136,16 @@ class Module(MgrModule):
daemon_stats = self.get_daemon_stats()
assert len(daemon_stats)
df_stats = self.get_df_stats()
result = {
'daemon_stats': daemon_stats,
'df_stats': df_stats
}
return 0, json.dumps(result, indent=2), 'Self-test OK'
else:
return (-errno.EINVAL, '',
"Command not found '{0}'".format(cmd['prefix']))
return (-errno.EINVAL, '',
"Command not found '{0}'".format(cmd['prefix']))
def serve(self):
if InfluxDBClient is None:
@ -155,8 +159,9 @@ class Module(MgrModule):
self.send_to_influx()
self.log.debug("Running interval loop")
interval = self.get_config("interval")
if interval is None:
interval = 5
self.log.debug("sleeping for %d seconds",interval)
self.event.wait(interval)
self.log.debug("sleeping for %d seconds", interval)
self.event.wait(interval)