openstack/ceilometer
Code Issues Proposed changes

Merge "Added new instance metrics to gnocchi definition"

Browse Source
This commit is contained in:
Jenkins
2017-01-04 10:25:30 +00:00
committed by Gerrit Code Review
parent 9c60b43c5d 62c7c3abdb
commit be1015079a
2 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ceilometer/dispatcher/data/gnocchi_resources.yaml
View File

@@ -39,10 +39,13 @@ resources:
- 'memory' - 'memory'
- 'memory.usage' - 'memory.usage'
- 'memory.resident' - 'memory.resident'
- 'memory.bandwidth.total'
- 'memory.bandwidth.local'
- 'vcpus' - 'vcpus'
- 'cpu' - 'cpu'
- 'cpu.delta' - 'cpu.delta'
- 'cpu_util' - 'cpu_util'
- 'cpu_l3_cache'
- 'disk.root.size' - 'disk.root.size'
- 'disk.ephemeral.size' - 'disk.ephemeral.size'
- 'disk.read.requests' - 'disk.read.requests'
@@ -59,6 +62,10 @@ resources:
- 'disk.allocation' - 'disk.allocation'
- 'disk.usage' - 'disk.usage'
- 'compute.instance.booting.time' - 'compute.instance.booting.time'
- 'perf.cpu.cycles'
- 'perf.instructions'
- 'perf.cache.references'
- 'perf.cache.misses'
attributes: attributes:
host: resource_metadata.(instance_host|host) host: resource_metadata.(instance_host|host)
image_ref: resource_metadata.image_ref image_ref: resource_metadata.image_ref

3
ceilometer/tests/unit/dispatcher/test_gnocchi.py
View File

@@ -531,7 +531,10 @@ class DispatcherWorkflowTest(base.BaseTestCase,
metric_names=[ metric_names=[
'instance', 'disk.root.size', 'disk.ephemeral.size', 'instance', 'disk.root.size', 'disk.ephemeral.size',
'memory', 'vcpus', 'memory.usage', 'memory.resident', 'memory', 'vcpus', 'memory.usage', 'memory.resident',
'memory.bandwidth.total', 'memory.bandwidth.local',
'cpu', 'cpu.delta', 'cpu_util', 'vcpus', 'disk.read.requests', 'cpu', 'cpu.delta', 'cpu_util', 'vcpus', 'disk.read.requests',
'cpu_l3_cache', 'perf.cpu.cycles', 'perf.instructions',
'perf.cache.references', 'perf.cache.misses',
'disk.read.requests.rate', 'disk.write.requests', 'disk.read.requests.rate', 'disk.write.requests',
'disk.write.requests.rate', 'disk.read.bytes', 'disk.write.requests.rate', 'disk.read.bytes',
'disk.read.bytes.rate', 'disk.write.bytes', 'disk.read.bytes.rate', 'disk.write.bytes',