Replace {} to {0} and sorted pools and osds
lets00 committed
Jan 3, 2018 at 13:25 UTC
da498e52d65a8b4f0b9f2c65a670ee62b5af1aa9
1 file changed
+4
-5
python.d/ceph.chart.py
+4
-5
@@ -73,18 +73,17 @@ class Service(SimpleService):
73
def create_definitions(self):
74
"""
75
Create dynamically charts options
76
- set on YAML file
76
:return: None
77
"""
78
# Lines
80
- for pool in self._get_df()['pools']:
79
+ for pool in sorted(self._get_df()['pools']):
80
self.definitions['pool_usage']['lines'].append([pool['name'],
81
pool['name'],
82
'absolute'])
84
- self.definitions['pool_objects']['lines'].append(["obj_{}".format(pool['name']),
83
+ self.definitions['pool_objects']['lines'].append(["obj_{0}".format(pool['name']),
84
pool['name'],
85
'absolute'])
87
- for osd in self._get_osd_df()['nodes']:
86
+ for osd in sorted(self._get_osd_df()['nodes']):
87
self.definitions['osd_usage']['lines'].append([osd['name'],
88
osd['name'],
89
'absolute'])
@@ -131,7 +130,7 @@ class Service(SimpleService):
130
"""
131
pool_objects = {}
132
for df in self._get_df()['pools']:
134
- pool_objects["obj_{}".format(df['name'])] = df['stats']['objects']
133
+ pool_objects["obj_{0}".format(df['name'])] = df['stats']['objects']
134
return pool_objects
135
136
def _get_osd_usage(self):