Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 15 additions & 16 deletions radosgw_usage_exporter.py
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,6 @@ def collect(self):
for metric in self._prometheus_metrics.values():
yield metric


def _request_data(self, query, args):
"""
Requests data from RGW. If admin entry and caps is fine - return
Expand Down Expand Up @@ -228,21 +227,21 @@ def _get_bucket_usage(self, bucket):

if bucket['usage']:
# Prefer bytes, instead kbytes
if 'size_actual' in bucket['usage']['rgw.main']:
bucket_usage_bytes = bucket['usage']['rgw.main']['size_actual']
# Hammer don't have bytes field
elif 'size_kb_actual' in bucket['usage']['rgw.main']:
usage_kb = bucket['usage']['rgw.main']['size_kb_actual']
bucket_usage_bytes = usage_kb * 1024

# Compressed buckets, since Kraken
if 'size_utilized' in bucket['usage']['rgw.main']:
bucket_utilized_bytes = bucket['usage']['rgw.main']['size_utilized']

# Get number of objects in bucket
if 'num_objects' in bucket['usage']['rgw.main']:
bucket_usage_objects = bucket['usage']['rgw.main']['num_objects']

if "rgw.main" in bucket['usage']:
if 'size_actual' in bucket['usage']['rgw.main']:
bucket_usage_bytes = bucket['usage']['rgw.main']['size_actual']
# Hammer don't have bytes field
elif 'size_kb_actual' in bucket['usage']['rgw.main']:
usage_kb = bucket['usage']['rgw.main']['size_kb_actual']
bucket_usage_bytes = usage_kb * 1024

# Compressed buckets, since Kraken
if 'size_utilized' in bucket['usage']['rgw.main']:
bucket_utilized_bytes = bucket['usage']['rgw.main']['size_utilized']

# Get number of objects in bucket
if 'num_objects' in bucket['usage']['rgw.main']:
bucket_usage_objects = bucket['usage']['rgw.main']['num_objects']

if 'zonegroup' in bucket:
bucket_zonegroup = bucket['zonegroup']
Expand Down