starlingx
/
gui
Code Issues Proposed changes

Merge "Correct storage I/O data stats in starlingx dashboard"

This commit is contained in:
Zuul 2019-08-14 16:16:07 +00:00 committed by Gerrit Code Review
parent 6f0db62cd0 cc30e1101d
commit 81b779a92f
2 changed files with 25 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/api/ceph.py
View File

@ -108,21 +108,30 @@ def storage_get():
}
# # I/O info
response, body = cephwrapper().osd_pool_stats(body='json',
pool_name='cinder-volumes')
response, body = cephwrapper().status(body='json')
if not response.ok:
response.raise_for_status()
stats = body['output'][0]['client_io_rate']
# not showing reads/sec at the moment
# reads_per_sec = stats['read_bytes_sec'] if (
# 'read_bytes_sec' in stats) else 0
stats = body['output']['pgmap']
reads_per_sec = stats['read_bytes_sec'] if (
'read_bytes_sec' in stats) else 0
read_operations_per_sec = stats['read_op_per_sec'] if (
'read_op_per_sec' in stats) else 0
writes_per_sec = stats['write_bytes_sec'] if (
'write_bytes_sec' in stats) else 0
operations_per_sec = stats['op_per_sec'] if ('op_per_sec' in stats) else 0
io = {
'writes_per_sec': writes_per_sec / 1024,
'operations_per_sec': operations_per_sec
}
write_operations_per_sec = stats['write_op_per_sec'] if (
'write_op_per_sec' in stats) else 0
if reads_per_sec:
io = {
'reads_per_sec': reads_per_sec / 1024,
'read_operations_per_sec': read_operations_per_sec,
'writes_per_sec': writes_per_sec / 1024,
'write_operations_per_sec': write_operations_per_sec
}
else:
io = {
'writes_per_sec': writes_per_sec / 1024,
'write_operations_per_sec': write_operations_per_sec
}
storage = {}
storage.update(space)

6
starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/admin/storage_overview/templates/storage_overview/_detail_storageservices.html
View File

@ -24,7 +24,11 @@
{{ storage.total }} {{" GiB total"}}</dd>
<dt>{% trans "Storage I/O" %}</dt>
<dd>{{ storage.writes_per_sec }} {{" kiB/s write, "}}
{{ storage.operations_per_sec }} {{" operations/second"}}</dd>
{{ storage.write_operations_per_sec }} {{" operations/second write"}}</dd>
{% if storage.reads_per_sec %}
<dd>{{ storage.reads_per_sec }} {{" kiB/s read, "}}
{{ storage.read_operations_per_sec }} {{" operations/second read"}}</dd>
{% endif %}
</dl>
</div>
{% else %}