Add General Objects
Luis Eduardo committed
Jan 24, 2018 at 20:38 UTC
541c0c4ff123884f2a64e7c9e5ce571bfe4c31eb
2 files changed
+25
-9
python.d/ceph.chart.py
+19
-7
@@ -16,17 +16,24 @@ update_every = 10
16
priority = 60000
17
retries = 60
18
19
-ORDER = ['general', 'pool_usage', 'pool_objects', 'pool_write_iops',
20
- 'pool_read_iops', 'osd_usage', 'osd_apply_latency','osd_commit_latency']
19
+ORDER = ['general_usage', 'general_objects', 'pool_usage',
20
+ 'pool_objects', 'pool_write_iops', 'pool_read_iops',
21
+ 'osd_usage', 'osd_apply_latency', 'osd_commit_latency']
22
23
CHARTS = {
23
- 'general': {
24
- 'options': [None, 'Ceph General Options', 'KB', 'general', 'ceph.general', 'stacked'],
24
+ 'general_usage': {
25
+ 'options': [None, 'Ceph General Space', 'KB', 'general', 'ceph.general_usage', 'stacked'],
26
'lines': [
27
['general_available', 'avail', 'absolute', 1, 1024],
28
['general_usage', 'used', 'absolute', 1, 1024]
29
]
30
},
31
+ 'general_objects': {
32
+ 'options': [None, 'Ceph General Objects', 'objects', 'general', 'ceph.general_objects', 'line'],
33
+ 'lines': [
34
+ ['general_objects', 'cluster', 'absolute']
35
+ ]
36
+ },
37
'pool_usage': {
38
'options': [None, 'Ceph Pools', 'KB', 'pool', 'ceph.pool_usage', 'line'],
39
'lines': []
@@ -144,9 +151,14 @@ class Service(SimpleService):
151
Get ceph's general usage
152
:return: dict
153
"""
147
- info = self._get_df()['stats']
148
- return {'general_usage': info['total_used_bytes'],
149
- 'general_available': info['total_avail_bytes']
154
+ df = self._get_df()
155
+ general_objects = 0
156
+ for pool in df['pools']:
157
+ general_objects = general_objects + pool['stats']['objects']
158
+
159
+ return {'general_usage': df['stats']['total_used_bytes'],
160
+ 'general_available': df['stats']['total_avail_bytes'],
161
+ 'general_objects': general_objects
162
}
163
164
def _get_pool_usage(self, pool):
web/dashboard_info.js
+6
-2
@@ -1318,8 +1318,12 @@ netdataDashboard.context = {
1318
// ------------------------------------------------------------------------
1319
// ceph
1320
1321
- 'ceph.general': {
1322
- info: 'Shows cluster general info.'
1321
+ 'ceph.general_usage': {
1322
+ info: 'Shows cluster general size info.'
1323
+ },
1324
+
1325
+ 'ceph.general_objects': {
1326
+ info: 'Shows cluster general objects.'
1327
},
1328
1329
'ceph.pool_usage': {