diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-09-25 18:33:56 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-09-25 18:33:56 +0000 |
| commit | f65359805a3a079bf952b39021be3b9c6ba61d61 (patch) | |
| tree | 1efead38584c8963187e9c26f4ec22901ce8a042 /ceilometer/compute | |
| parent | 86440a25f7bc15165dc91baf17d10baa072259c9 (diff) | |
| parent | 0d4eb0bb863b8d9c6f8ad46897e6c19c816df5c2 (diff) | |
| download | ceilometer-f65359805a3a079bf952b39021be3b9c6ba61d61.tar.gz | |
Merge "fix disk total_time metrics"
Diffstat (limited to 'ceilometer/compute')
| -rw-r--r-- | ceilometer/compute/pollsters/disk.py | 4 | ||||
| -rw-r--r-- | ceilometer/compute/virt/libvirt/inspector.py | 17 |
2 files changed, 9 insertions, 12 deletions
diff --git a/ceilometer/compute/pollsters/disk.py b/ceilometer/compute/pollsters/disk.py index c3074309..c1928548 100644 --- a/ceilometer/compute/pollsters/disk.py +++ b/ceilometer/compute/pollsters/disk.py @@ -242,12 +242,12 @@ class PerDevicePhysicalPollster(PerDeviceDiskPollster): class PerDeviceDiskReadLatencyPollster(PerDeviceDiskPollster): sample_name = 'disk.device.read.latency' sample_type = sample.TYPE_CUMULATIVE - sample_unit = 'ms' + sample_unit = 'ns' sample_stats_key = 'rd_total_times' class PerDeviceDiskWriteLatencyPollster(PerDeviceDiskPollster): sample_name = 'disk.device.write.latency' sample_type = sample.TYPE_CUMULATIVE - sample_unit = 'ms' + sample_unit = 'ns' sample_stats_key = 'wr_total_times' diff --git a/ceilometer/compute/virt/libvirt/inspector.py b/ceilometer/compute/virt/libvirt/inspector.py index eaf4d575..543d533d 100644 --- a/ceilometer/compute/virt/libvirt/inspector.py +++ b/ceilometer/compute/virt/libvirt/inspector.py @@ -122,16 +122,13 @@ class LibvirtInspector(virt_inspector.Inspector): for target in tree.findall('devices/disk/target')]): block_stats = domain.blockStats(device) block_stats_flags = domain.blockStatsFlags(device, 0) - wr_times = block_stats_flags['wr_total_times']*1.0/1000 - rd_times = block_stats_flags['rd_total_times']*1.0/1000 - yield virt_inspector.DiskStats(device=device, - read_requests=block_stats[0], - read_bytes=block_stats[1], - write_requests=block_stats[2], - write_bytes=block_stats[3], - errors=block_stats[4], - wr_total_times=wr_times, - rd_total_times=rd_times) + yield virt_inspector.DiskStats( + device=device, + read_requests=block_stats[0], read_bytes=block_stats[1], + write_requests=block_stats[2], write_bytes=block_stats[3], + errors=block_stats[4], + wr_total_times=block_stats_flags['wr_total_times'], + rd_total_times=block_stats_flags['rd_total_times']) @libvirt_utils.retry_on_disconnect def inspect_disk_info(self, instance, duration): |